refact, fix: Package managers

core/tabs/applications-setup/Developer-tools/githubdesktop-setup.sh

@@ -9,20 +9,22 @@ installGithubDesktop() {
             apt-get|nala)
                 curl -fsSL https://apt.packages.shiftkey.dev/gpg.key | gpg --dearmor | "$ESCALATION_TOOL" tee /usr/share/keyrings/shiftkey-packages.gpg > /dev/null
                 printf "%b\n" 'deb [arch=amd64 signed-by=/usr/share/keyrings/shiftkey-packages.gpg] https://apt.packages.shiftkey.dev/ubuntu/ any main\n' | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/shiftkey-packages.list > /dev/null
-                "$ESCALATION_TOOL" "$PACKAGER" install github-desktop
+                "$ESCALATION_TOOL" "$PACKAGER" update
+                "$ESCALATION_TOOL" "$PACKAGER" install -y github-desktop
                 ;;
             zypper)
                 "$ESCALATION_TOOL" rpm --import https://rpm.packages.shiftkey.dev/gpg.key
                 printf "%b\n" '[shiftkey-packages]\nname=GitHub Desktop\nbaseurl=https://rpm.packages.shiftkey.dev/rpm/\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://rpm.packages.shiftkey.dev/gpg.key\n' | "$ESCALATION_TOOL" tee /etc/zypp/repos.d/shiftkey-packages.repo > /dev/null
-                "$ESCALATION_TOOL" "$PACKAGER" ref && "$ESCALATION_TOOL" "$PACKAGER" install github-desktop
+                "$ESCALATION_TOOL" "$PACKAGER" refresh
+                "$ESCALATION_TOOL" "$PACKAGER" install -y github-desktop
                 ;;
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm github-desktop-bin
                 ;;
             dnf)
                 "$ESCALATION_TOOL" rpm --import https://rpm.packages.shiftkey.dev/gpg.key
                 printf "%b\n" '[shiftkey-packages]\nname=GitHub Desktop\nbaseurl=https://rpm.packages.shiftkey.dev/rpm/\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://rpm.packages.shiftkey.dev/gpg.key\n' | "$ESCALATION_TOOL" tee /etc/yum.repos.d/shiftkey-packages.repo > /dev/null
-                "$ESCALATION_TOOL" "$PACKAGER" install github-desktop
+                "$ESCALATION_TOOL" "$PACKAGER" install -y github-desktop
                 ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"

core/tabs/applications-setup/Developer-tools/neovim-setup.sh

@@ -32,10 +32,7 @@ installNeovim() {
         apt-get|nala)
             "$ESCALATION_TOOL" "$PACKAGER" install -y neovim ripgrep fd-find python3-venv luarocks golang-go shellcheck git
             ;;
-        dnf)
-            "$ESCALATION_TOOL" "$PACKAGER" install -y neovim ripgrep fzf python3-virtualenv luarocks golang ShellCheck git
-            ;;
-        zypper)
+        dnf|zypper)
             "$ESCALATION_TOOL" "$PACKAGER" install -y neovim ripgrep fzf python3-virtualenv luarocks golang ShellCheck git
             ;;
         *)

core/tabs/applications-setup/Developer-tools/ngrok-setup.sh

@@ -5,7 +5,7 @@
 installNgrok() {
     if ! command_exists ngrok; then
         printf "%b\n" "${YELLOW}Installing Ngrok...${RC}"
-        curl -sSLo https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz | "$ESCALATION_TOOL" tar -xz -C /usr/local/bin
+        curl -sSLO https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz | "$ESCALATION_TOOL" tar -xz -C /usr/local/bin
     else
         printf "%b\n" "${GREEN}Ngrok is already installed.${RC}"
     fi

core/tabs/applications-setup/Developer-tools/sublime-setup.sh

@@ -6,25 +6,25 @@ installSublime() {
 	if ! command_exists sublime; then
             printf "%b\n" "${YELLOW}Installing Sublime...${RC}"
             case "$PACKAGER" in
-                apt-get)
+                apt-get|nala)
                     curl -fsSL https://download.sublimetext.com/sublimehq-pub.gpg | "$ESCALATION_TOOL" apt-key add -
                     echo "deb https://download.sublimetext.com/ apt/stable/" | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/sublime-text.list
-                    "$ESCALATION_TOOL" "$PACKAGER" install sublime-text
+                    "$ESCALATION_TOOL" "$PACKAGER" update
+                    "$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text
                     ;;
                 zypper)
                     "$ESCALATION_TOOL" rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg
                     "$ESCALATION_TOOL" "$PACKAGER" addrepo -g -f https://download.sublimetext.com/rpm/dev/x86_64/sublime-text.repo
-                    "$ESCALATION_TOOL" "$PACKAGER" install sublime-text
+                    "$ESCALATION_TOOL" "$PACKAGER" refresh
+                    "$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text
                     ;;
                 pacman)
-                    curl -O https://download.sublimetext.com/sublimehq-pub.gpg && "$ESCALATION_TOOL" pacman-key --add sublimehq-pub.gpg && "$ESCALATION_TOOL" pacman-key --lsign-key 8A8F901A && rm sublimehq-pub.gpg
-                    printf "%b\n" '[sublime-text]\nServer = https://download.sublimetext.com/arch/stable/x86_64' | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
-                    "$ESCALATION_TOOL" "$PACKAGER" -Syu --noconfirm sublime-text
+                    "$AUR_HELPER" -S --needed --noconfirm sublime-text-4
                     ;;
                 dnf)
                     "$ESCALATION_TOOL" rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg
                     "$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.sublimetext.com/rpm/stable/x86_64/sublime-text.repo
-                    "$ESCALATION_TOOL" "$PACKAGER" install sublime-text
+                    "$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text
                     ;;
                 *)
                     printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"

core/tabs/applications-setup/Developer-tools/vscode-setup.sh

@@ -11,21 +11,22 @@ installVsCode() {
                 "$ESCALATION_TOOL" install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
                 echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/vscode.list > /dev/null
                 rm -f packages.microsoft.gpg
-                "$ESCALATION_TOOL" "$PACKAGER" install apt-transport-https
-                "$ESCALATION_TOOL" "$PACKAGER" install code 
+                "$ESCALATION_TOOL" "$PACKAGER" update
+                "$ESCALATION_TOOL" "$PACKAGER" install -y apt-transport-https code
                 ;;
             zypper)
                 "$ESCALATION_TOOL" rpm --import https://packages.microsoft.com/keys/microsoft.asc
                 printf "%b\n" '[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ntype=rpm-md\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc' | "$ESCALATION_TOOL" tee /etc/zypp/repos.d/vscode.repo > /dev/null
-                "$ESCALATION_TOOL" "$PACKAGER" install code
+                "$ESCALATION_TOOL" "$PACKAGER" refresh
+                "$ESCALATION_TOOL" "$PACKAGER" install -y code
                 ;;
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm code
                 ;;
             dnf)
                 "$ESCALATION_TOOL" rpm --import https://packages.microsoft.com/keys/microsoft.asc
                 printf "%b\n" '[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc' | "$ESCALATION_TOOL" tee /etc/yum.repos.d/vscode.repo > /dev/null
-                "$ESCALATION_TOOL" "$PACKAGER" install code
+                "$ESCALATION_TOOL" "$PACKAGER" install -y code
                 ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"

core/tabs/applications-setup/Developer-tools/vscodium-setup.sh

@@ -6,21 +6,26 @@ installVsCodium() {
     if ! command_exists codium; then
         printf "%b\n" "${YELLOW}Installing VS Codium...${RC}"
         case "$PACKAGER" in
-            apt-get)
+            apt-get|nala)
                 curl -fsSL https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg | gpg --dearmor | "$ESCALATION_TOOL" dd of=/usr/share/keyrings/vscodium-archive-keyring.gpg
                 echo 'deb [ signed-by=/usr/share/keyrings/vscodium-archive-keyring.gpg ] https://download.vscodium.com/debs vscodium main' | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/vscodium.list
-                "$ESCALATION_TOOL" "$PACKAGER" install codium
+                "$ESCALATION_TOOL" "$PACKAGER" update
+                "$ESCALATION_TOOL" "$PACKAGER" install -y codium
                 ;;
             zypper)
                 "$ESCALATION_TOOL" rpmkeys --import https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg
                 printf "%b\n" "[gitlab.com_paulcarroty_vscodium_repo]\nname=gitlab.com_paulcarroty_vscodium_repo\nbaseurl=https://download.vscodium.com/rpms/\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg\nmetadata_expire=1h" | "$ESCALATION_TOOL" tee -a /etc/zypp/repos.d/vscodium.repo
+                "$ESCALATION_TOOL" "$PACKAGER" refresh
+                "$ESCALATION_TOOL" "$PACKAGER" install -y codium
+
                 ;;
             pacman)
                 "$AUR_HELPER" -S --noconfirm vscodium-bin
                 ;;
             dnf)
                 "$ESCALATION_TOOL" rpmkeys --import https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg
                 printf "%b\n" "[gitlab.com_paulcarroty_vscodium_repo]\nname=download.vscodium.com\nbaseurl=https://download.vscodium.com/rpms/\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg\nmetadata_expire=1h" | "$ESCALATION_TOOL" tee -a /etc/yum.repos.d/vscodium.repo
+                "$ESCALATION_TOOL" "$PACKAGER" install -y codium
                 ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"

core/tabs/applications-setup/android-debloat.sh

@@ -9,13 +9,10 @@ install_adb() {
             apt-get|nala)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y android-sdk-platform-tools
                 ;;
-            zypper)
-                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install android-tools
-                ;;
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm android-tools
                 ;;
-            dnf)
+            dnf|zypper)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y android-tools
                 ;;
             *)

core/tabs/applications-setup/browser-setup.sh

@@ -39,12 +39,13 @@ install_thorium() {
             apt-get|nala)
                 "$ESCALATION_TOOL" rm -fv /etc/apt/sources.list.d/thorium.list
                 "$ESCALATION_TOOL" curl http://dl.thorium.rocks/debian/dists/stable/thorium.list -o /etc/apt/sources.list.d/thorium.list
+                "$ESCALATION_TOOL" "$PACKAGER" update
                 "$ESCALATION_TOOL" "$PACKAGER" install -y thorium-browser
                 ;;
             zypper|dnf)
                 url=$(curl -s https://api.github.com/repos/Alex313031/Thorium/releases/latest | grep -oP '(?<=browser_download_url": ")[^"]*\.rpm')
                     echo "$url" && curl -L "$url" -o thorium-latest.rpm
-                    "$ESCALATION_TOOL" rpm -i thorium-latest.rpm && rm thorium-latest.rpm
+                    "$ESCALATION_TOOL" "$PACKAGER" install -y thorium-latest.rpm && rm thorium-latest.rpm
                 ;;
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm thorium-browser-bin
@@ -98,6 +99,7 @@ Suites: $distro
 Components: main
 Architectures: amd64
 Signed-By: /usr/share/keyrings/librewolf.gpg" | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/librewolf.sources > /dev/null
+            "$ESCALATION_TOOL" "$PACKAGER" update
 			"$ESCALATION_TOOL" "$PACKAGER" install -y librewolf
 			;;
 		dnf)
@@ -107,8 +109,8 @@ Signed-By: /usr/share/keyrings/librewolf.gpg" | "$ESCALATION_TOOL" tee /etc/apt/
 		zypper)
 			"$ESCALATION_TOOL" rpm --import https://rpm.librewolf.net/pubkey.gpg
 			"$ESCALATION_TOOL" zypper ar -ef https://rpm.librewolf.net librewolf
-			"$ESCALATION_TOOL" zypper ref
-			"$ESCALATION_TOOL" zypper in librewolf
+			"$ESCALATION_TOOL" zypper refresh
+			"$ESCALATION_TOOL" zypper install -y librewolf
 			;;
 		pacman)
 			"$AUR_HELPER" -S --needed --noconfirm librewolf-bin
@@ -131,12 +133,14 @@ install_brave() {
                 "$ESCALATION_TOOL" "$PACKAGER" install -y curl
                 "$ESCALATION_TOOL" curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg
                 echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg] https://brave-browser-apt-release.s3.brave.com/ stable main"| "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/brave-browser-release.list
+                "$ESCALATION_TOOL" "$PACKAGER" update
                 "$ESCALATION_TOOL" "$PACKAGER" install -y brave-browser
                 ;;
             zypper)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y curl
                 "$ESCALATION_TOOL" rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
                 "$ESCALATION_TOOL" "$PACKAGER" addrepo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
+                "$ESCALATION_TOOL" "$PACKAGER" refresh
                 "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install brave-browser
                 ;;
             pacman)
@@ -176,19 +180,11 @@ install_chromium() {
     if ! command_exists chromium; then
     printf "%b\n" "${YELLOW}Installing Chromium...${RC}"
         case "$PACKAGER" in
-            apt-get|nala|zypper)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y chromium
-                ;;
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm chromium
                 ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
-                "$ESCALATION_TOOL" "$PACKAGER" install -y chromium
-                ;;
             *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-                exit 1
+                "$ESCALATION_TOOL" "$PACKAGER" install -y chromium
                 ;;
         esac
     else

core/tabs/applications-setup/communication-apps/jitsi-setup.sh

@@ -9,6 +9,7 @@ installJitsi() {
             apt-get|nala)
                 curl https://download.jitsi.org/jitsi-key.gpg.key | "$ESCALATION_TOOL" gpg --dearmor > /usr/share/keyrings/jitsi-keyring.gpg
                 printf "%b\n" 'deb [signed-by=/usr/share/keyrings/jitsi-keyring.gpg] https://download.jitsi.org stable/' | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/jitsi-stable.list > /dev/null
+                "$ESCALATION_TOOL" "$PACKAGER" update
                 "$ESCALATION_TOOL" "$PACKAGER" -y install jitsi-meet
                 ;;
             zypper)

core/tabs/applications-setup/communication-apps/signal-setup.sh

@@ -10,6 +10,7 @@ installSignal() {
                 curl -fsSL https://updates.signal.org/desktop/apt/keys.asc | gpg --dearmor > signal-desktop-keyring.gpg
                 cat signal-desktop-keyring.gpg | "$ESCALATION_TOOL" tee /usr/share/keyrings/signal-desktop-keyring.gpg > /dev/null
                 printf "%b\n" 'deb [arch=amd64 signed-by=/usr/share/keyrings/signal-desktop-keyring.gpg] https://updates.signal.org/desktop/apt xenial main' | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/signal-xenial.list
+                "$ESCALATION_TOOL" "$PACKAGER" update
                 "$ESCALATION_TOOL" "$PACKAGER" -y install signal-desktop
                 ;;
             zypper)

core/tabs/applications-setup/communication-apps/telegram-setup.sh

@@ -6,21 +6,11 @@ installTelegram() {
     if ! command_exists telegram-desktop; then
         printf "%b\n" "${YELLOW}Installing Telegram...${RC}"
         case "$PACKAGER" in
-            apt-get|nala)
-                "$ESCALATION_TOOL" "$PACKAGER" -y install telegram-desktop
-                ;;
-            zypper)
-                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install telegram-desktop
-                ;;
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm telegram-desktop 
                 ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y telegram-desktop 
-                ;;
             *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-                exit 1
+                "$ESCALATION_TOOL" "$PACKAGER" install -y telegram-desktop 
                 ;;
         esac
     else

core/tabs/applications-setup/communication-apps/thunderbird-setup.sh

@@ -6,21 +6,11 @@ installThunderBird() {
     if ! command_exists thunderbird; then
         printf "%b\n" "${YELLOW}Installing Thunderbird...${RC}"
         case "$PACKAGER" in
-            apt-get|nala)
-                "$ESCALATION_TOOL" "$PACKAGER" -y install thunderbird
-                ;;
-            zypper)
-                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install thunderbird
-                ;;
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm thunderbird
                 ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y thunderbird 
-                ;;
             *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-                exit 1
+                "$ESCALATION_TOOL" "$PACKAGER" install -y thunderbird 
                 ;;
         esac
     else

core/tabs/applications-setup/mybash-setup.sh

@@ -11,18 +11,8 @@ installDepend() {
         pacman)
             "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm bash bash-completion tar bat tree unzip fontconfig git
             ;;
-        apt-get|nala)
-            "$ESCALATION_TOOL" "$PACKAGER" install -y bash bash-completion tar bat tree unzip fontconfig git
-            ;;
-        dnf)
-            "$ESCALATION_TOOL" "$PACKAGER" install -y bash bash-completion tar bat tree unzip fontconfig git
-            ;;
-        zypper)
-            "$ESCALATION_TOOL" "$PACKAGER" install -y bash bash-completion tar bat tree unzip fontconfig git
-            ;;
         *)
-            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-            exit 1
+            "$ESCALATION_TOOL" "$PACKAGER" install -y bash bash-completion tar bat tree unzip fontconfig git
             ;;
     esac
     fi

core/tabs/applications-setup/office-suite-setup.sh

@@ -79,7 +79,7 @@ install_freeoffice() {
             ;;
         zypper)
             "$ESCALATION_TOOL" "$PACKAGER" addrepo -f https://shop.softmaker.com/repo/rpm SoftMaker
-            "$ESCALATION_TOOL" "$PACKAGER" --gpg-auto-import-keys ref
+            "$ESCALATION_TOOL" "$PACKAGER" --gpg-auto-import-keys refresh
             "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install softmaker-freeoffice-2024
             ;;
         pacman)

core/tabs/utils/power-profile.sh

@@ -31,13 +31,10 @@ installAutoCpufreq() {
             git clone https://github.com/AdnanHodzic/auto-cpufreq.git
         fi
 
-        case "$PACKAGER" in
-            *)
-                cd auto-cpufreq
-                printf "%b\n" "${YELLOW}Running auto-cpufreq installer...${RC}"
-                "$ESCALATION_TOOL" ./auto-cpufreq-installer
-                ;;
-        esac
+        cd auto-cpufreq
+        printf "%b\n" "${YELLOW}Running auto-cpufreq installer...${RC}"
+        "$ESCALATION_TOOL" ./auto-cpufreq-installer
+
         cd ..
     fi
 }