Merge e67e36b23a into e3688e9b3d

* fix(system-cleanup): some issues

* new packager quotes

.github/CONTRIBUTING.md

@@ -16,6 +16,7 @@ cd linutil
    ```
 
 ## 3. Make your changes
+
 - **Edit the files you want to change**: Make your changes to the relevant files.
 - **Test your changes**: Run `cargo run` to test your modifications in a local environment and ensure everything works as expected.
 
@@ -60,6 +61,7 @@ cd linutil
 ## 11. Documentation
 
 - **Update the documentation**: If your change affects the functionality, please update the relevant documentation files to reflect this.
+- **Automatic generation**: If you decide to add functionality through a new shell script, make sure to fill out all fields in `tab_data.toml` and run `cargo xtask docgen`.
 
 ## 12. License
 

.github/workflows/github-pages.yml

@@ -22,7 +22,7 @@ jobs:
 
       - name: Copy Contributing Guidelines
         run: |
-          echo "<!-- THIS FILE IS GENERATED AUTOMATICALLY. EDIT .github/CONTRIBUTING.md -->\n\n$(cat .github/CONTRIBUTING.md)" > 'docs/contributing.md'
+          echo -e "<!-- THIS FILE IS GENERATED AUTOMATICALLY. EDIT .github/CONTRIBUTING.md -->\n\n$(cat .github/CONTRIBUTING.md)" > 'docs/contributing.md'
 
       - uses: stefanzweifel/git-auto-commit-action@v5
         with:

core/tabs/applications-setup/linutil-installer.sh

@@ -35,10 +35,10 @@ installLinutil() {
                         printf "%b\n" "${YELLOW}Installing rustup...${RC}"
                         case "$PACKAGER" in
                             pacman)
-                                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm rustup
+                                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm curl rustup man-db
                                 ;;
                             dnf)
-                                "$ESCALATION_TOOL" "$PACKAGER" install -y rustup
+                                "$ESCALATION_TOOL" "$PACKAGER" install -y curl rustup man-pages man-db man
                                 ;;
                             zypper)
                                 "$ESCALATION_TOOL" "$PACKAGER" install -n curl gcc make
@@ -54,12 +54,23 @@ installLinutil() {
                     rustup default stable
                     cargo install --force linutil_tui
                     printf "%b\n" "${GREEN}Installed successfully.${RC}"
+                    installExtra
                     ;;
                 *) printf "%b\n" "${RED}Linutil not installed.${RC}" ;;
             esac
     esac
 }
 
+installExtra() {
+    printf "%b\n" "${YELLOW}Installing the manpage...${RC}"
+    "$ESCALATION_TOOL" mkdir -p /usr/share/man/man1
+    curl 'https://raw.githubusercontent.com/ChrisTitusTech/linutil/refs/heads/main/man/linutil.1' | "$ESCALATION_TOOL" tee '/usr/share/man/man1/linutil.1' > /dev/null
+    printf "%b\n" "${YELLOW}Creating a Desktop Entry...${RC}"
+    "$ESCALATION_TOOL" mkdir -p /usr/share/applications
+    curl 'https://raw.githubusercontent.com/ChrisTitusTech/linutil/refs/heads/main/linutil.desktop' | "$ESCALATION_TOOL" tee /usr/share/applications/linutil.desktop > /dev/null
+    printf "%b\n" "${GREEN}Done.${RC}"
+}
+
 checkEnv
 checkEscalationTool
 checkAURHelper

core/tabs/system-setup/system-cleanup.sh

@@ -26,16 +26,21 @@ cleanup_system() {
             "$ESCALATION_TOOL" "$PACKAGER" -Rns $(pacman -Qtdq) --noconfirm > /dev/null 2>&1
             ;;
         *)
-            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+            printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}. Skipping.${RC}"
-            return 1
             ;;
     esac
 }
 
 common_cleanup() {
-    "$ESCALATION_TOOL" find /var/tmp -type f -atime +5 -delete
+    if [ -d /var/tmp ]; then
-    "$ESCALATION_TOOL" find /tmp -type f -atime +5 -delete
+        "$ESCALATION_TOOL" find /var/tmp -type f -atime +5 -delete
-    "$ESCALATION_TOOL" find /var/log -type f -name "*.log" -exec truncate -s 0 {} \;
+    fi
+    if [ -d /tmp ]; then
+        "$ESCALATION_TOOL" find /tmp -type f -atime +5 -delete
+    fi
+    if [ -d /var/log ]; then
+        "$ESCALATION_TOOL" find /var/log -type f -name "*.log" -exec truncate -s 0 {} \;
+    fi
     "$ESCALATION_TOOL" journalctl --vacuum-time=3d
 }
 
@@ -45,8 +50,12 @@ clean_data() {
     case $clean_response in
         y|Y)
             printf "%b\n" "${YELLOW}Cleaning up old cache files and emptying trash...${RC}"
-            find "$HOME/.cache/" -type f -atime +5 -delete
+            if [ -d "$HOME/.cache" ]; then
-            find "$HOME/.local/share/Trash" -mindepth 1 -delete
+                find "$HOME/.cache/" -type f -atime +5 -delete
+            fi
+            if [ -d "$HOME/.local/share/Trash" ]; then
+                find "$HOME/.local/share/Trash" -mindepth 1 -delete
+            fi
             printf "%b\n" "${GREEN}Cache and trash cleanup completed.${RC}"
             ;;
         *)

core/tabs/utils/monitor-control/change_orientation.sh

@@ -13,7 +13,7 @@ change_orientation() {
     printf "%b\n" "${YELLOW}=========================================${RC}"
     printf "%b\n" "${YELLOW}  Change Monitor Orientation${RC}"
     printf "%b\n" "${YELLOW}=========================================${RC}"
-    printf "%b" "${YELLOW}Choose a monitor to configure: ${RC}"
+    printf "%b\n" "${YELLOW}Choose a monitor to configure: ${RC}"
     i=1
     for monitor in $monitor_array; do
         printf "%b\n" "$i. ${GREEN}$monitor${RC}"

core/tabs/utils/monitor-control/disable_monitor.sh

@@ -13,7 +13,7 @@ disable_monitor() {
     printf "%b\n" "${YELLOW}=========================================${RC}"
     printf "%b\n" "${YELLOW}  Disable Monitor${RC}"
     printf "%b\n" "${YELLOW}=========================================${RC}"
-    printf "%b" "Choose a monitor to disable: "
+    printf "%b\n" "Choose a monitor to disable: "
     i=1
     for monitor in $monitor_array; do
         printf "%b\n" "$i. ${GREEN}$monitor${RC}"

core/tabs/utils/monitor-control/enable_monitor.sh

@@ -13,7 +13,7 @@ enable_monitor() {
     printf "%b\n" "${YELLOW}=========================================${RC}"
     printf "%b\n" "${YELLOW}  Enable Monitor${RC}"
     printf "%b\n" "${YELLOW}=========================================${RC}"
-    printf "%b" "${YELLOW}Choose a monitor to enable: ${RC}"
+    printf "%b\n" "${YELLOW}Choose a monitor to enable: ${RC}"
     
     i=1
     for monitor in $monitor_array; do

core/tabs/utils/monitor-control/extend_displays.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-. ./utility_functions.sh
+. ../utility_functions.sh
 
 . ../../common-script.sh
 

core/tabs/utils/monitor-control/manage_arrangement.sh

@@ -13,10 +13,10 @@ manage_arrangement() {
     printf "%b\n" "${YELLOW}=========================================${RC}"
     printf "%b\n" "${YELLOW}  Manage Monitor Arrangement${RC}"
     printf "%b\n" "${YELLOW}=========================================${RC}"
-    printf "%b" "${YELLOW}Choose the monitor to arrange: ${RC}"
+    printf "%b\n" "${YELLOW}Choose the monitor to arrange: ${RC}"
     i=1
     for monitor in $monitor_array; do
-        printf "%b\n" "$i. ${YELLOW}$monitor${RC}"
+        printf "%b\n" "$i. ${GREEN}$monitor${RC}"
         i=$((i + 1))
     done
 

core/tabs/utils/monitor-control/set_primary_monitor.sh

@@ -16,7 +16,7 @@ set_primary_monitor() {
     printf "%b\n" "${YELLOW}Choose a monitor to set as primary:${RC}"
     i=1
     for monitor in $monitor_array; do
-        printf "%b\n" "$i. ${YELLOW}$monitor${RC}"
+        printf "%b\n" "$i. ${GREEN}$monitor${RC}"
         i=$((i + 1))
     done
 

docs/contributing.md

@@ -1,4 +1,6 @@
-<!-- THIS FILE IS GENERATED AUTOMATICALLY. EDIT .github/CONTRIBUTING.md -->\n\n# Contributing Guidelines for Linutil
+<!-- THIS FILE IS GENERATED AUTOMATICALLY. EDIT .github/CONTRIBUTING.md -->
+
+# Contributing Guidelines for Linutil
 
 Thank you for considering contributing to Linutil! We appreciate your effort in helping improve this project. To ensure that your contributions align with the goals and quality standards of Linutil, please follow these guidelines:
 
@@ -16,6 +18,7 @@ cd linutil
    ```
 
 ## 3. Make your changes
+
 - **Edit the files you want to change**: Make your changes to the relevant files.
 - **Test your changes**: Run `cargo run` to test your modifications in a local environment and ensure everything works as expected.
 
@@ -60,6 +63,7 @@ cd linutil
 ## 11. Documentation
 
 - **Update the documentation**: If your change affects the functionality, please update the relevant documentation files to reflect this.
+- **Automatic generation**: If you decide to add functionality through a new shell script, make sure to fill out all fields in `tab_data.toml` and run `cargo xtask docgen`.
 
 ## 12. License
 

tui/src/filter.rs

@@ -1,5 +1,5 @@
 use crate::{state::ListEntry, theme::Theme};
-use crossterm::event::{KeyCode, KeyEvent};
+use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 use ego_tree::NodeId;
 use linutil_core::Tab;
 use ratatui::{
@@ -116,21 +116,27 @@ impl Filter {
     pub fn handle_key(&mut self, event: &KeyEvent) -> SearchAction {
         //Insert user input into the search bar
         match event.code {
+            KeyCode::Char('c') if event.modifiers.contains(KeyModifiers::CONTROL) => {
+                return self.exit_search()
+            }
             KeyCode::Char(c) => self.insert_char(c),
             KeyCode::Backspace => self.remove_previous(),
             KeyCode::Delete => self.remove_next(),
             KeyCode::Left => return self.cursor_left(),
             KeyCode::Right => return self.cursor_right(),
-            KeyCode::Esc => {
-                self.input_position = 0;
-                self.search_input.clear();
-                return SearchAction::Exit;
-            }
             KeyCode::Enter => return SearchAction::Exit,
+            KeyCode::Esc => return self.exit_search(),
             _ => return SearchAction::None,
         };
         SearchAction::Update
     }
+
+    fn exit_search(&mut self) -> SearchAction {
+        self.input_position = 0;
+        self.search_input.clear();
+        SearchAction::Exit
+    }
+
     fn cursor_left(&mut self) -> SearchAction {
         self.input_position = self.input_position.saturating_sub(1);
         SearchAction::None

tui/src/hint.rs

@@ -27,41 +27,33 @@ pub fn create_shortcut_list(
     shortcuts: impl IntoIterator<Item = Shortcut>,
     render_width: u16,
 ) -> Box<[Line<'static>]> {
-    let hints = shortcuts.into_iter().collect::<Box<[Shortcut]>>();
+    let shortcut_spans: Vec<Vec<Span<'static>>> =
+        shortcuts.into_iter().map(|h| h.to_spans()).collect();
 
-    let mut shortcut_spans: Vec<Vec<Span<'static>>> = hints.iter().map(|h| h.to_spans()).collect();
+    let max_shortcut_width = shortcut_spans
+        .iter()
+        .map(|s| span_vec_len(s))
+        .max()
+        .unwrap_or(0);
 
-    let mut lines: Vec<Line<'static>> = vec![];
+    let columns = (render_width as usize / (max_shortcut_width + 4)).max(1);
+    let rows = (shortcut_spans.len() + columns - 1) / columns;
 
-    loop {
+    let mut lines: Vec<Line<'static>> = Vec::new();
-        let split_idx = shortcut_spans
+
-            .iter()
+    for row in 0..rows {
-            .scan(0usize, |total_len, s| {
+        let row_spans: Vec<_> = (0..columns)
-                // take at least one so that we guarantee that we drain the list
+            .filter_map(|col| {
-                // otherwise, this might lock up if there's a shortcut that exceeds the window width
+                let index = row * columns + col;
-                if *total_len == 0 {
+                shortcut_spans.get(index).map(|span| {
-                    *total_len += span_vec_len(s) + 4;
+                    let padding = max_shortcut_width - span_vec_len(span);
-                    Some(())
+                    let mut span_clone = span.clone();
-                } else {
+                    span_clone.push(Span::raw(" ".repeat(padding)));
-                    *total_len += span_vec_len(s);
+                    span_clone
-                    if *total_len > render_width as usize {
+                })
-                        None
-                    } else {
-                        *total_len += 4;
-                        Some(())
-                    }
-                }
             })
-            .count();
+            .collect();
-
+        lines.push(add_spacing(row_spans));
-        let rest = shortcut_spans.split_off(split_idx);
-        lines.push(add_spacing(shortcut_spans));
-
-        if rest.is_empty() {
-            break;
-        } else {
-            shortcut_spans = rest;
-        }
     }
 
     lines.into_boxed_slice()

tui/src/state.rs

@@ -22,8 +22,8 @@ use ratatui::{
 use std::rc::Rc;
 use temp_dir::TempDir;
 
-const MIN_WIDTH: u16 = 77;
+const MIN_WIDTH: u16 = 100;
-const MIN_HEIGHT: u16 = 19;
+const MIN_HEIGHT: u16 = 25;
 const TITLE: &str = concat!("Linux Toolbox - ", env!("BUILD_DATE"));
 const ACTIONS_GUIDE: &str = "List of important tasks performed by commands' names:
 
@@ -119,7 +119,10 @@ impl AppState {
         match self.focus {
             Focus::Search => (
                 "Search bar",
-                Box::new([Shortcut::new("Finish search", ["Enter"])]),
+                Box::new([
+                    Shortcut::new("Abort search", ["Esc", "CTRL-c"]),
+                    Shortcut::new("Search", ["Enter"]),
+                ]),
             ),
 
             Focus::List => {