Skip to content

Commit 2ce1be1

Browse files
authored
Bug/applications/minor bugs (#1112)
* Mirrored gaming changes * Added remove .deb files for several isntalls, added telegram from flatpak, fixed librewolf on debian
1 parent ab732f7 commit 2ce1be1

File tree

8 files changed

+12
-14
lines changed

8 files changed

+12
-14
lines changed

core/tabs/applications-setup/browsers/firefox.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ installFirefox() {
77
printf "%b\n" "${YELLOW}Installing Mozilla Firefox...${RC}"
88
case "$PACKAGER" in
99
apt-get|nala)
10-
"$ESCALATION_TOOL" "$PACKAGER" install -y firefox-esr
10+
if [ "$DTYPE" != "ubuntu" ]; then
11+
"$ESCALATION_TOOL" "$PACKAGER" install -y firefox-esr
12+
fi
1113
;;
1214
zypper)
1315
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install MozillaFirefox

core/tabs/applications-setup/browsers/google-chrome.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ installChrome() {
99
apt-get|nala)
1010
curl -O https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
1111
"$ESCALATION_TOOL" "$PACKAGER" install -y ./google-chrome-stable_current_amd64.deb
12+
"$ESCALATION_TOOL" rm ./google-chrome-stable_current_amd64.deb
1213
;;
1314
zypper)
1415
"$ESCALATION_TOOL" "$PACKAGER" addrepo http://dl.google.com/linux/chrome/rpm/stable/x86_64 Google-Chrome

core/tabs/applications-setup/browsers/librewolf.sh

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,9 @@ installLibreWolf() {
77
printf "%b\n" "${YELLOW}Installing Librewolf...${RC}"
88
case "$PACKAGER" in
99
apt-get|nala)
10-
"$ESCALATION_TOOL" "$PACKAGER" install -y gnupg lsb-release apt-transport-https ca-certificates
11-
distro=$(if echo " una bookworm vanessa focal jammy bullseye vera uma " | grep -q "$(lsb_release -sc)"; then "$(lsb_release -sc)"; else echo 'focal'; fi)
12-
curl -fsSL https://deb.librewolf.net/keyring.gpg | "$ESCALATION_TOOL" gpg --dearmor -o /usr/share/keyrings/librewolf.gpg
13-
echo "Types: deb
14-
URIs: https://deb.librewolf.net
15-
Suites: $distro
16-
Components: main
17-
Architectures: amd64
18-
Signed-By: /usr/share/keyrings/librewolf.gpg" | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/librewolf.sources > /dev/null
19-
"$ESCALATION_TOOL" "$PACKAGER" update
20-
"$ESCALATION_TOOL" "$PACKAGER" install -y librewolf
10+
"$ESCALATION_TOOL" "$PACKAGER" update && "$ESCALATION_TOOL" "$PACKAGER" install -y extrepo
11+
"$ESCALATION_TOOL" extrepo enable librewolf
12+
"$ESCALATION_TOOL" "$PACKAGER" update && "$ESCALATION_TOOL" "$PACKAGER" install -y librewolf
2113
;;
2214
dnf)
2315
curl -fsSL https://rpm.librewolf.net/librewolf-repo.repo | pkexec tee /etc/yum.repos.d/librewolf.repo > /dev/null

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ installDiscord() {
99
apt-get|nala)
1010
curl -Lo discord.deb "https://discord.com/api/download?platform=linux&format=deb"
1111
"$ESCALATION_TOOL" "$PACKAGER" install -y discord.deb
12+
"$ESCALATION_TOOL" rm discord.deb
1213
;;
1314
zypper|eopkg)
1415
"$ESCALATION_TOOL" "$PACKAGER" install -y discord

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ installTelegram() {
1919
"$ESCALATION_TOOL" "$PACKAGER" install -y telegram
2020
;;
2121
*)
22-
"$ESCALATION_TOOL" "$PACKAGER" install -y telegram-desktop
22+
flatpak install flathub --noninteractive org.telegram.desktop
2323
;;
2424
esac
2525
else

core/tabs/applications-setup/office-suites/freeoffice.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ installFreeOffice() {
99
apt-get|nala)
1010
curl -O https://www.softmaker.net/down/softmaker-freeoffice-2024_1218-01_amd64.deb
1111
"$ESCALATION_TOOL" "$PACKAGER" install -y ./softmaker-freeoffice-2024_1218-01_amd64.deb
12+
"$ESCALATION_TOOL" rm ./softmaker-freeoffice-2024_1218-01_amd64.deb
1213
;;
1314
zypper)
1415
"$ESCALATION_TOOL" "$PACKAGER" addrepo -f https://shop.softmaker.com/repo/rpm SoftMaker

core/tabs/applications-setup/office-suites/onlyoffice.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ installOnlyOffice() {
99
apt-get|nala)
1010
curl -O https://download.onlyoffice.com/install/desktop/editors/linux/onlyoffice-desktopeditors_amd64.deb
1111
"$ESCALATION_TOOL" "$PACKAGER" install -y ./onlyoffice-desktopeditors_amd64.deb
12+
"$ESCALATION_TOOL" rm ./onlyoffice-desktopeditors_amd64.deb
1213
;;
1314
zypper|dnf|xbps-install|eopkg|apk)
1415
checkFlatpak

core/tabs/system-setup/gaming-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ installAdditionalDepend() {
7474
;;
7575
apt-get | nala)
7676
version=$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' https://github.com/lutris/lutris |
77-
grep -v 'beta' |
77+
grep -v 'latest' |
7878
tail -n1 |
7979
cut -d '/' --fields=3)
8080

0 commit comments

Comments
 (0)