diff --git a/core/tabs/applications-setup/browser-setup.sh b/core/tabs/applications-setup/browser-setup.sh index 62b8cbff..0e3ba181 100644 --- a/core/tabs/applications-setup/browser-setup.sh +++ b/core/tabs/applications-setup/browser-setup.sh @@ -39,7 +39,6 @@ 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) @@ -99,7 +98,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 + "$ESCALATION_TOOL" "$PACKAGER" install -y librewolf ;; dnf) curl -fsSL https://rpm.librewolf.net/librewolf-repo.repo | pkexec tee /etc/yum.repos.d/librewolf.repo > /dev/null @@ -135,7 +134,6 @@ 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) diff --git a/core/tabs/applications-setup/office-suite-setup.sh b/core/tabs/applications-setup/office-suite-setup.sh index bbf54602..56301198 100644 --- a/core/tabs/applications-setup/office-suite-setup.sh +++ b/core/tabs/applications-setup/office-suite-setup.sh @@ -15,7 +15,7 @@ install_onlyoffice() { flatpak install -y flathub org.onlyoffice.desktopeditors ;; pacman) - "$AUR_HELPER" -S --noconfirm onlyoffice + "$AUR_HELPER" -S --needed --noconfirm onlyoffice ;; *) printf "%b\n" "${RED}The script does not support your Distro. Install manually..${RC}" @@ -38,7 +38,7 @@ install_libreoffice() { flatpak install -y flathub org.libreoffice.LibreOffice ;; pacman) - "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm libreoffice-fresh + "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm libreoffice-fresh ;; *) printf "%b\n" "${RED}Unsupported package manager. Please install Thorium manually.${RC}" @@ -85,8 +85,7 @@ install_freeoffice() { ;; dnf) "$ESCALATION_TOOL" curl -O -qO /etc/yum.repos.d/softmaker.repo https://shop.softmaker.com/repo/softmaker.repo - "$ESCALATION_TOOL" "$PACKAGER" update - "$ESCALATION_TOOL" "$PACKAGER" install softmaker-freeoffice-2024 + "$ESCALATION_TOOL" "$PACKAGER" install -y softmaker-freeoffice-2024 ;; *) printf "%b\n" "${RED}The script does not support your Distro. Install manually..${RC}" diff --git a/core/tabs/system-setup/docker-setup.sh b/core/tabs/system-setup/docker-setup.sh index b082788b..c41d168a 100755 --- a/core/tabs/system-setup/docker-setup.sh +++ b/core/tabs/system-setup/docker-setup.sh @@ -47,14 +47,13 @@ install_docker_compose() { printf "%b\n" "${YELLOW}Installing Docker Compose...${RC}" case "$PACKAGER" in apt-get|nala|yum) - "$ESCALATION_TOOL" "$PACKAGER" update "$ESCALATION_TOOL" "$PACKAGER" install -y docker-compose-plugin ;; zypper) "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install docker-compose ;; pacman) - "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm docker-compose + "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm docker-compose ;; *) printf "${RED}Unsupported package manager. Please install Docker Compose manually.${RC}\n" diff --git a/core/tabs/system-setup/gaming-setup.sh b/core/tabs/system-setup/gaming-setup.sh index f414928f..0e2782b8 100755 --- a/core/tabs/system-setup/gaming-setup.sh +++ b/core/tabs/system-setup/gaming-setup.sh @@ -23,7 +23,7 @@ installDepend() { ncurses lib32-ncurses vulkan-icd-loader lib32-vulkan-icd-loader ocl-icd lib32-ocl-icd libva lib32-libva \ gst-plugins-base-libs lib32-gst-plugins-base-libs sdl2" - $AUR_HELPER -S --needed --noconfirm "$DEPENDENCIES" $DISTRO_DEPS + $AUR_HELPER -S --needed --noconfirm "$DEPENDENCIES" "$DISTRO_DEPS" ;; apt-get|nala) DISTRO_DEPS="libasound2 libsdl2 wine64 wine32" @@ -33,18 +33,18 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y software-properties-common "$ESCALATION_TOOL" apt-add-repository contrib -y "$ESCALATION_TOOL" "$PACKAGER" update - "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" $DISTRO_DEPS + "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$DISTRO_DEPS" ;; dnf) "$ESCALATION_TOOL" "$PACKAGER" install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm -y "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable fedora-cisco-openh264 -y - "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES + "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" ;; zypper) - "$ESCALATION_TOOL" "$PACKAGER" -n install $DEPENDENCIES + "$ESCALATION_TOOL" "$PACKAGER" -n install "$DEPENDENCIES" ;; *) - "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES + "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" ;; esac } @@ -53,7 +53,7 @@ installAdditionalDepend() { case "$PACKAGER" in pacman) DISTRO_DEPS='steam lutris goverlay' - "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm $DISTRO_DEPS + "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$DISTRO_DEPS" ;; apt-get|nala) version=$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' https://github.com/lutris/lutris | @@ -65,10 +65,9 @@ installAdditionalDepend() { curl -sSLo "lutris_${version_no_v}_all.deb" "https://github.com/lutris/lutris/releases/download/${version}/lutris_${version_no_v}_all.deb" printf "%b\n" "${YELLOW}Installing Lutris...${RC}" - "$ESCALATION_TOOL" "$PACKAGER" update - "$ESCALATION_TOOL" "$PACKAGER" install ./lutris_${version_no_v}_all.deb + "$ESCALATION_TOOL" "$PACKAGER" install ./lutris_"${version_no_v}"_all.deb - rm lutris_${version_no_v}_all.deb + rm lutris_"${version_no_v}"_all.deb printf "%b\n" "${GREEN}Lutris Installation complete.${RC}" printf "%b\n" "${YELLOW}Installing steam...${RC}" diff --git a/core/tabs/system-setup/global-theme.sh b/core/tabs/system-setup/global-theme.sh index 47144151..12c934e6 100644 --- a/core/tabs/system-setup/global-theme.sh +++ b/core/tabs/system-setup/global-theme.sh @@ -6,15 +6,12 @@ install_theme_tools() { printf "%b\n" "${YELLOW}Installing theme tools (qt6ct and kvantum)...${RC}\n" case "$PACKAGER" in apt-get|nala) - "$ESCALATION_TOOL" "$PACKAGER" update "$ESCALATION_TOOL" "$PACKAGER" install -y qt6ct kvantum ;; zypper) - "$ESCALATION_TOOL" "$PACKAGER" refresh "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install qt6ct kvantum ;; dnf) - "$ESCALATION_TOOL" "$PACKAGER" update "$ESCALATION_TOOL" "$PACKAGER" install -y qt6ct kvantum ;; pacman) diff --git a/core/tabs/system-setup/samba-ssh-setup.sh b/core/tabs/system-setup/samba-ssh-setup.sh index 4989a222..6c338746 100755 --- a/core/tabs/system-setup/samba-ssh-setup.sh +++ b/core/tabs/system-setup/samba-ssh-setup.sh @@ -9,7 +9,7 @@ install_package() { if ! command_exists "$PACKAGE"; then case "$PACKAGER" in pacman) - "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm "$PACKAGE" + "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$PACKAGE" ;; *) "$ESCALATION_TOOL" "$PACKAGER" install -y "$PACKAGE" diff --git a/core/tabs/utils/encrypt_decrypt_tool.sh b/core/tabs/utils/encrypt_decrypt_tool.sh index 446a2e14..de960274 100644 --- a/core/tabs/utils/encrypt_decrypt_tool.sh +++ b/core/tabs/utils/encrypt_decrypt_tool.sh @@ -11,7 +11,7 @@ if ! command_exists openssl; then "$ESCALATION_TOOL" "$PACKAGER" -Syu --noconfirm openssl ;; apt-get|nala) - "$ESCALATION_TOOL" "$PACKAGER" update && "$ESCALATION_TOOL" "$PACKAGER" install -y openssl + "$ESCALATION_TOOL" "$PACKAGER" install -y openssl ;; dnf) "$ESCALATION_TOOL" "$PACKAGER" install -y openssl