Refactor utility functions

Separate utitility functions into user manager functions and monitor control functions, disable somechecks and formatting

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

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
-
+. ./monitor-control-functions.sh
-. ../../common-script.sh
 
 # Function to auto-detect displays and set common resolution
 auto_detect_displays() {

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

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
-
+. ./monitor-control-functions.sh
-. ../../common-script.sh
 
 # Function to change monitor orientation
 change_orientation() {
@@ -47,7 +46,10 @@ change_orientation() {
         2) orientation="left" ;;
         3) orientation="right" ;;
         4) orientation="inverted" ;;
-        *) printf "%b\n" "${RED}Invalid selection.${RC}"; return ;;
+        *)
+            printf "%b\n" "${RED}Invalid selection.${RC}"
+            return
+            ;;
     esac
 
     if confirm_action "Change orientation of $monitor_name to $orientation?"; then

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

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
-
+. ./monitor-control-functions.sh
-. ../../common-script.sh
 
 # Function to disable a monitor
 disable_monitor() {

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

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
-
+. ./monitor-control-functions.sh
-. ../../common-script.sh
 
 # Function to duplicate displays
 duplicate_displays() {

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

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
-
+. ./monitor-control-functions.sh
-. ../../common-script.sh
 
 # Function to enable a monitor
 enable_monitor() {

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

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
-
+. ./monitor-control-functions.sh
-. ../../common-script.sh
 
 # Function to extend displays
 extend_displays() {

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

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
-
+. ./monitor-control-functions.sh
-. ../../common-script.sh
 
 # Function to manage monitor arrangement
 manage_arrangement() {
@@ -45,7 +44,10 @@ manage_arrangement() {
         2) position="--right-of" ;;
         3) position="--above" ;;
         4) position="--below" ;;
-        *) printf "%b\n" "${RED}Invalid selection.${RC}"; return ;;
+        *)
+            printf "%b\n" "${RED}Invalid selection.${RC}"
+            return
+            ;;
     esac
 
     printf "%b\n" "${YELLOW}Choose the reference monitor:${RC}"

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

@@ -30,6 +30,7 @@ execute_command() {
     command="$1"
     printf "Executing: %s\n" "$command"
     eval "$command" 2>&1 | tee /tmp/xrandr.log | tail -n 20
+    #shellcheck disable=SC2181
     if [ $? -ne 0 ]; then
         printf "%b\n" "${RED}An error occurred while executing the command. Check /tmp/xrandr.log for details.${RC}"
     fi
@@ -87,31 +88,6 @@ confirm_action() {
     fi
 }
 
-checkEmpty() {
-    if [ -z "$1" ]; then
-        printf "%b\n" "${RED}Empty value is not allowed${RC}" >&2
-        exit 1
-    fi
-}
-
-checkGroups() {
-    groups="$1"
-    available_groups="$2"
-    for group in $groups; do
-        if ! echo "$available_groups" | grep -q -w "$group"; then
-            return 1
-        fi
-    done
-    return 0
-}
-
-confirmAction() {
-    if [ "$confirm" != "y" ] && [ "$confirm" != "Y" ]; then
-        printf "%b\n" "${RED}Cancelled operation...${RC}" >&2
-        exit 1
-    fi
-}
-
 checkEnv
 checkEscalationTool
 setup_xrandr

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

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
-
+. ./monitor-control-functions.sh
-. ../../common-script.sh
 
 # Function to Reset scaling back to 1 (native resolution) for all monitors
 Reset_scaling() {

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

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
-
+. ./monitor-control-functions.sh
-. ../../common-script.sh
 
 # Function to scale smaller monitors to the highest resolution of a bigger monitor
 scale_monitors() {

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

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
+. ./monitor-control-functions.sh
 
 # Function to adjust brightness for a selected monitor
 adjust_monitor_brightness() {
@@ -29,7 +30,7 @@ adjust_monitor_brightness() {
         if ! echo "$monitor_choice" | grep -qE '^[0-9]+$'; then
             printf "%b\n" "${RED}Invalid selection. Please try again.${RC}"
             printf "Press [Enter] to continue..."
-            read -r dummy
+            read -r _
             continue
         fi
 
@@ -37,7 +38,7 @@ adjust_monitor_brightness() {
         if [ "$monitor_choice" -lt 1 ] || [ "$monitor_choice" -gt "$monitor_count" ]; then
             printf "%b\n" "${RED}Invalid selection. Please try again.${RC}"
             printf "Press [Enter] to continue..."
-            read -r dummy
+            read -r _
             continue
         fi
 

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

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
-
+. ./monitor-control-functions.sh
-. ../../common-script.sh
 
 # Function to set a monitor as primary
 set_primary_monitor() {

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

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../utility_functions.sh
+# shellcheck disable=SC1091
-
+. ./monitor-control-functions.sh
-. ../../common-script.sh
 
 # Function to set resolutions
 set_resolutions() {
@@ -33,7 +32,7 @@ set_resolutions() {
         if ! echo "$monitor_choice" | grep -qE '^[0-9]+$' || [ "$monitor_choice" -lt 1 ] || [ "$monitor_choice" -gt "$((i - 1))" ]; then
             printf "%b\n" "${RED}Invalid selection. Please try again.${RC}"
             printf "%b\n" "Press [Enter] to continue..."
-            read -r dummy
+            read -r _
             continue
         fi
 

core/tabs/utils/user-account-manager/add_to_group.sh

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../../common-script.sh
+# shellcheck disable=SC1091
-
+. ./user-manager-functions.sh
-. ../utility_functions.sh
 
 addToGroup() {
     clear
@@ -24,7 +23,7 @@ addToGroup() {
     printf "%b" "${YELLOW}Enter the groups you want to add user $username to (space-separated): ${RC}"
     read -r groups
 
-    checkEmpty "$groups" || exit 1
+    checkEmpty "$groups"
     if ! checkGroups "$groups" "$available_groups"; then
         printf "%b\n" "${RED}One or more groups are not available.${RC}"
         exit 1
@@ -34,14 +33,11 @@ addToGroup() {
 
     printf "%b" "${YELLOW}Are you sure you want to add user $username to $groups_to_add? [Y/n]: ${RC}"
     read -r confirm
-    confirmAction || exit 1
+    confirmAction "$confirm"
 
     "$ESCALATION_TOOL" usermod -aG "$groups_to_add" "$username"
 
     printf "%b\n" "${GREEN}User successfully added to the $groups_to_add${RC}"
 }
 
-checkEnv
-checkEscalationTool
-checkGroups
 addToGroup

core/tabs/utils/user-account-manager/add_user.sh

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../../common-script.sh
+# shellcheck disable=SC1091
-
+. ./user-manager-functions.sh
-. ../utility_functions.sh
 
 createUser() {
     clear
@@ -11,6 +10,8 @@ createUser() {
     printf "%b" "${YELLOW}Enter the username: ${RC}"
     read -r username
 
+    checkEmpty "$username"
+
     if ! echo "$username" | grep '^[a-zA-Z]*$' >/dev/null; then
         printf "%b\n" "${RED}Username must only contain letters and cannot contain spaces.${RC}"
         exit 1
@@ -33,6 +34,4 @@ createUser() {
     printf "%b\n" "${GREEN}To add additional groups use Add User To Groups${RC}"
 }
 
-checkEnv
-checkEscalationTool
 createUser

core/tabs/utils/user-account-manager/change_password.sh

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../../common-script.sh
+# shellcheck disable=SC1091
-
+. ./user-manager-functions.sh
-. ../utility_functions.sh
 
 changePassword() {
     clear
@@ -12,13 +11,15 @@ changePassword() {
     printf "%b" "${YELLOW}Enter the username: ${RC}"
     read -r username
 
+    checkEmpty "$username"
+
     if id "$username" >/dev/null 2>&1; then
         printf "%b" "${YELLOW}Enter new password: ${RC}"
         read -r password
 
         printf "%b" "${YELLOW}Are you sure you want to change password for ""$username""? [Y/n]: ${RC}"
         read -r confirm
-        confirmAction || exit 1
+        confirmAction "$confirm"
 
         echo "$username:$password" | "$ESCALATION_TOOL" chpasswd
         printf "%b\n" "${GREEN}Password changed successfully${RC}"
@@ -28,6 +29,4 @@ changePassword() {
     fi
 }
 
-checkEnv
-checkEscalationTool
 changePassword

core/tabs/utils/user-account-manager/delete_user.sh

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../../common-script.sh
+# shellcheck disable=SC1091
-
+. ./user-manager-functions.sh
-. ../utility_functions.sh
 
 deleteUser() {
     clear
@@ -12,10 +11,12 @@ deleteUser() {
     printf "%b" "${YELLOW}Enter the username: ${RC}"
     read -r username
 
+    checkEmpty "$username"
+
     if id "$username" >/dev/null 2>&1; then
         printf "%b" "${YELLOW}Are you sure you want to delete user ""$username""? [Y/n]: ${RC}"
         read -r confirm
-        confirmAction || exit 1
+        confirmAction "$confirm"
 
         $ESCALATION_TOOL userdel --remove "$username" 2>/dev/null
         printf "%b\n" "${GREEN}User $username deleted successfully${RC}"
@@ -25,6 +26,4 @@ deleteUser() {
     fi
 }
 
-checkEnv
-checkEscalationTool
 deleteUser

core/tabs/utils/user-account-manager/remove_from_group.sh

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 
-. ../../common-script.sh
+# shellcheck disable=SC1091
-
+. ./user-manager-functions.sh
-. ../utility_functions.sh
 
 removeFromGroup() {
     clear
@@ -12,6 +11,8 @@ removeFromGroup() {
     printf "%b" "${YELLOW}Enter the username: ${RC}"
     read -r username
 
+    checkEmpty "$username"
+
     if ! id "$username" >/dev/null 2>&1; then
         printf "%b\n" "${RED}User $username does not exist.${RC}"
         exit 1
@@ -25,7 +26,7 @@ removeFromGroup() {
     printf "%b" "${YELLOW}Enter the groups you want to remove user $username from (space-separated): ${RC} "
     read -r groups
 
-    checkEmpty "$groups" || exit 1
+    checkEmpty "$groups"
     if ! checkGroups "$groups" "$user_groups"; then
         printf "%b\n" "${RED}One or more specified groups do not exist.${RC}"
         exit 1
@@ -35,13 +36,12 @@ removeFromGroup() {
 
     printf "%b" "${YELLOW}Are you sure you want to remove user $username from $groups_to_remove? [Y/n]: ${RC}"
     read -r confirm
-    confirmAction || exit 1
+    confirmAction "$confirm"
 
+    #shellcheck disable=SC2086
     $ESCALATION_TOOL usermod -rG $groups_to_remove "$username"
 
     printf "%b\n" "${GREEN}User successfully removed from $groups_to_remove${RC}"
 }
 
-checkEnv
-checkEscalationTool
 removeFromGroup

core/tabs/utils/user-account-manager/user-manager-functions.sh

@@ -0,0 +1,31 @@
+#!/bin/sh -e
+
+. ../../common-script.sh
+
+checkGroups() {
+    groups="$1"
+    available_groups="$2"
+    for group in $groups; do
+        if ! echo "$available_groups" | grep -q -w "$group"; then
+            return 1
+        fi
+    done
+    return 0
+}
+
+confirmAction() {
+    confirm="$1"
+    if [ "$confirm" != "y" ] && [ "$confirm" != "Y" ]; then
+        printf "%b\n" "${RED}Cancelled operation...${RC}" >&2
+        exit 1
+    fi
+}
+
+checkEmpty() {
+    if [ -z "$1" ]; then
+        printf "%b\n" "${RED}Empty value is not allowed${RC}" >&2
+        exit 1
+    fi
+}
+
+checkEnv