diff --git a/tabs/common-script.sh b/tabs/common-script.sh index aa4deae9..45d925e7 100644 --- a/tabs/common-script.sh +++ b/tabs/common-script.sh @@ -125,7 +125,7 @@ checkDistro() { checkEnv() { checkCommandRequirements 'curl groups sudo' - checkPackageManager 'apt-get nala dnf pacman zypper yum xbps-install nix-env' + checkPackageManager 'nala apt-get dnf pacman zypper yum xbps-install nix-env' checkCurrentDirectoryWritable checkSuperUser checkDistro diff --git a/tabs/system-setup/3-global-theme.sh b/tabs/system-setup/3-global-theme.sh index c3e360da..d5b1c667 100644 --- a/tabs/system-setup/3-global-theme.sh +++ b/tabs/system-setup/3-global-theme.sh @@ -5,20 +5,20 @@ install_theme_tools() { printf "%b\n" "${YELLOW}Installing theme tools (qt6ct and kvantum)...${RC}\n" case $PACKAGER in - apt-get) - $ESCALATION_TOOL apt-get update - $ESCALATION_TOOL apt-get install -y qt6ct kvantum + apt-get|nala) + $ESCALATION_TOOL "${PACKAGER}" update + $ESCALATION_TOOL "${PACKAGER}" install -y qt6ct kvantum ;; zypper) - $ESCALATION_TOOL zypper refresh - $ESCALATION_TOOL zypper --non-interactive install qt6ct kvantum + $ESCALATION_TOOL "${PACKAGER}" refresh + $ESCALATION_TOOL "${PACKAGER}" --non-interactive install qt6ct kvantum ;; dnf) - $ESCALATION_TOOL dnf update - $ESCALATION_TOOL dnf install -y qt6ct kvantum + $ESCALATION_TOOL "${PACKAGER}" update + $ESCALATION_TOOL "${PACKAGER}" install -y qt6ct kvantum ;; pacman) - $ESCALATION_TOOL pacman -S --needed --noconfirm qt6ct kvantum + $ESCALATION_TOOL "${PACKAGER}" -S --needed --noconfirm qt6ct kvantum ;; *) printf "%b\n" "${RED}Unsupported package manager. Please install qt6ct and kvantum manually.${RC}\n" diff --git a/tabs/utils/monitor-control/utility_functions.sh b/tabs/utils/monitor-control/utility_functions.sh index 48b4c8da..d2bde151 100755 --- a/tabs/utils/monitor-control/utility_functions.sh +++ b/tabs/utils/monitor-control/utility_functions.sh @@ -10,7 +10,7 @@ setup_xrandr() { pacman) $ESCALATION_TOOL "${PACKAGER}" -S --noconfirm xorg-xrandr ;; - apt-get) + apt-get|nala) $ESCALATION_TOOL "${PACKAGER}" install -y x11-xserver-utils ;; *) @@ -83,4 +83,5 @@ confirm_action() { } checkEnv -setup_xrandr \ No newline at end of file +checkEscalationTool +setup_xrandr