mirror of
https://github.com/ChrisTitusTech/linutil.git
synced 2024-11-05 13:15:21 +00:00
Fix general inconsistencies and unnecessary updating (#584)
Co-authored-by: nnyyxxxx <nnyyxxxx@users.noreply.github.com>
This commit is contained in:
parent
b21ae519fb
commit
43464d1f03
|
@ -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)
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user