Skip to content

Commit 3fca5d7

Browse files
jeevithakannan2jeevithakannan2
committed
Fix package managers
1 parent 64e8492 commit 3fca5d7

File tree

12 files changed

+41
-59
lines changed

12 files changed

+41
-59
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,22 @@ installGithubDesktop() {
99
apt-get|nala)
1010
curl -fsSL https://apt.packages.shiftkey.dev/gpg.key | gpg --dearmor | "$ESCALATION_TOOL" tee /usr/share/keyrings/shiftkey-packages.gpg > /dev/null
1111
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
12-
"$ESCALATION_TOOL" "$PACKAGER" install github-desktop
12+
"$ESCALATION_TOOL" "$PACKAGER" update
13+
"$ESCALATION_TOOL" "$PACKAGER" install -y github-desktop
1314
;;
1415
zypper)
1516
"$ESCALATION_TOOL" rpm --import https://rpm.packages.shiftkey.dev/gpg.key
1617
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
17-
"$ESCALATION_TOOL" "$PACKAGER" ref && "$ESCALATION_TOOL" "$PACKAGER" install github-desktop
18+
"$ESCALATION_TOOL" "$PACKAGER" refresh
19+
"$ESCALATION_TOOL" "$PACKAGER" install -y github-desktop
1820
;;
1921
pacman)
2022
"$AUR_HELPER" -S --needed --noconfirm github-desktop-bin
2123
;;
2224
dnf)
2325
"$ESCALATION_TOOL" rpm --import https://rpm.packages.shiftkey.dev/gpg.key
2426
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
25-
"$ESCALATION_TOOL" "$PACKAGER" install github-desktop
27+
"$ESCALATION_TOOL" "$PACKAGER" install -y github-desktop
2628
;;
2729
*)
2830
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ installNeovim() {
3232
apt-get|nala)
3333
"$ESCALATION_TOOL" "$PACKAGER" install -y neovim ripgrep fd-find python3-venv luarocks golang-go shellcheck git
3434
;;
35-
dnf)
36-
"$ESCALATION_TOOL" "$PACKAGER" install -y neovim ripgrep fzf python3-virtualenv luarocks golang ShellCheck git
37-
;;
38-
zypper)
35+
dnf|zypper)
3936
"$ESCALATION_TOOL" "$PACKAGER" install -y neovim ripgrep fzf python3-virtualenv luarocks golang ShellCheck git
4037
;;
4138
*)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
installNgrok() {
66
if ! command_exists ngrok; then
77
printf "%b\n" "${YELLOW}Installing Ngrok...${RC}"
8-
curl -sSLo https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz | "$ESCALATION_TOOL" tar -xz -C /usr/local/bin
8+
curl -sSLO https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz | "$ESCALATION_TOOL" tar -xz -C /usr/local/bin
99
else
1010
printf "%b\n" "${GREEN}Ngrok is already installed.${RC}"
1111
fi

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ installSublime() {
66
if ! command_exists sublime; then
77
printf "%b\n" "${YELLOW}Installing Sublime...${RC}"
88
case "$PACKAGER" in
9-
apt-get)
9+
apt-get|nala)
1010
curl -fsSL https://download.sublimetext.com/sublimehq-pub.gpg | "$ESCALATION_TOOL" apt-key add -
1111
echo "deb https://download.sublimetext.com/ apt/stable/" | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/sublime-text.list
12-
"$ESCALATION_TOOL" "$PACKAGER" install sublime-text
12+
"$ESCALATION_TOOL" "$PACKAGER" update
13+
"$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text
1314
;;
1415
zypper)
1516
"$ESCALATION_TOOL" rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg
1617
"$ESCALATION_TOOL" "$PACKAGER" addrepo -g -f https://download.sublimetext.com/rpm/dev/x86_64/sublime-text.repo
17-
"$ESCALATION_TOOL" "$PACKAGER" install sublime-text
18+
"$ESCALATION_TOOL" "$PACKAGER" refresh
19+
"$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text
1820
;;
1921
pacman)
20-
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
21-
printf "%b\n" '[sublime-text]\nServer = https://download.sublimetext.com/arch/stable/x86_64' | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
22-
"$ESCALATION_TOOL" "$PACKAGER" -Syu --noconfirm sublime-text
22+
"$AUR_HELPER" -S --needed --noconfirm sublime-text-4
2323
;;
2424
dnf)
2525
"$ESCALATION_TOOL" rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg
2626
"$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.sublimetext.com/rpm/stable/x86_64/sublime-text.repo
27-
"$ESCALATION_TOOL" "$PACKAGER" install sublime-text
27+
"$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text
2828
;;
2929
*)
3030
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,22 @@ installVsCode() {
1111
"$ESCALATION_TOOL" install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
1212
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
1313
rm -f packages.microsoft.gpg
14-
"$ESCALATION_TOOL" "$PACKAGER" install apt-transport-https
15-
"$ESCALATION_TOOL" "$PACKAGER" install code
14+
"$ESCALATION_TOOL" "$PACKAGER" update
15+
"$ESCALATION_TOOL" "$PACKAGER" install -y apt-transport-https code
1616
;;
1717
zypper)
1818
"$ESCALATION_TOOL" rpm --import https://packages.microsoft.com/keys/microsoft.asc
1919
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
20-
"$ESCALATION_TOOL" "$PACKAGER" install code
20+
"$ESCALATION_TOOL" "$PACKAGER" refresh
21+
"$ESCALATION_TOOL" "$PACKAGER" install -y code
2122
;;
2223
pacman)
2324
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm code
2425
;;
2526
dnf)
2627
"$ESCALATION_TOOL" rpm --import https://packages.microsoft.com/keys/microsoft.asc
2728
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
28-
"$ESCALATION_TOOL" "$PACKAGER" install code
29+
"$ESCALATION_TOOL" "$PACKAGER" install -y code
2930
;;
3031
*)
3132
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,26 @@ installVsCodium() {
66
if ! command_exists codium; then
77
printf "%b\n" "${YELLOW}Installing VS Codium...${RC}"
88
case "$PACKAGER" in
9-
apt-get)
9+
apt-get|nala)
1010
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
1111
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
12-
"$ESCALATION_TOOL" "$PACKAGER" install codium
12+
"$ESCALATION_TOOL" "$PACKAGER" update
13+
"$ESCALATION_TOOL" "$PACKAGER" install -y codium
1314
;;
1415
zypper)
1516
"$ESCALATION_TOOL" rpmkeys --import https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg
1617
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
18+
"$ESCALATION_TOOL" "$PACKAGER" refresh
19+
"$ESCALATION_TOOL" "$PACKAGER" install -y codium
20+
1721
;;
1822
pacman)
1923
"$AUR_HELPER" -S --noconfirm vscodium-bin
2024
;;
2125
dnf)
2226
"$ESCALATION_TOOL" rpmkeys --import https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg
2327
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
28+
"$ESCALATION_TOOL" "$PACKAGER" install -y codium
2429
;;
2530
*)
2631
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@ install_adb() {
99
apt-get|nala)
1010
"$ESCALATION_TOOL" "$PACKAGER" install -y android-sdk-platform-tools
1111
;;
12-
zypper)
13-
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install android-tools
14-
;;
1512
pacman)
1613
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm android-tools
1714
;;
18-
dnf)
15+
dnf|zypper)
1916
"$ESCALATION_TOOL" "$PACKAGER" install -y android-tools
2017
;;
2118
*)

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,13 @@ install_thorium() {
3939
apt-get|nala)
4040
"$ESCALATION_TOOL" rm -fv /etc/apt/sources.list.d/thorium.list
4141
"$ESCALATION_TOOL" curl http://dl.thorium.rocks/debian/dists/stable/thorium.list -o /etc/apt/sources.list.d/thorium.list
42+
"$ESCALATION_TOOL" "$PACKAGER" update
4243
"$ESCALATION_TOOL" "$PACKAGER" install -y thorium-browser
4344
;;
4445
zypper|dnf)
4546
url=$(curl -s https://api.github.com/repos/Alex313031/Thorium/releases/latest | grep -oP '(?<=browser_download_url": ")[^"]*\.rpm')
4647
echo "$url" && curl -L "$url" -o thorium-latest.rpm
47-
"$ESCALATION_TOOL" rpm -i thorium-latest.rpm && rm thorium-latest.rpm
48+
"$ESCALATION_TOOL" "$PACKAGER" install -y thorium-latest.rpm && rm thorium-latest.rpm
4849
;;
4950
pacman)
5051
"$AUR_HELPER" -S --needed --noconfirm thorium-browser-bin
@@ -98,6 +99,7 @@ Suites: $distro
9899
Components: main
99100
Architectures: amd64
100101
Signed-By: /usr/share/keyrings/librewolf.gpg" | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/librewolf.sources > /dev/null
102+
"$ESCALATION_TOOL" "$PACKAGER" update
101103
"$ESCALATION_TOOL" "$PACKAGER" install -y librewolf
102104
;;
103105
dnf)
@@ -107,8 +109,8 @@ Signed-By: /usr/share/keyrings/librewolf.gpg" | "$ESCALATION_TOOL" tee /etc/apt/
107109
zypper)
108110
"$ESCALATION_TOOL" rpm --import https://rpm.librewolf.net/pubkey.gpg
109111
"$ESCALATION_TOOL" zypper ar -ef https://rpm.librewolf.net librewolf
110-
"$ESCALATION_TOOL" zypper ref
111-
"$ESCALATION_TOOL" zypper in librewolf
112+
"$ESCALATION_TOOL" zypper refresh
113+
"$ESCALATION_TOOL" zypper install -y librewolf
112114
;;
113115
pacman)
114116
"$AUR_HELPER" -S --needed --noconfirm librewolf-bin
@@ -131,12 +133,14 @@ install_brave() {
131133
"$ESCALATION_TOOL" "$PACKAGER" install -y curl
132134
"$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
133135
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
136+
"$ESCALATION_TOOL" "$PACKAGER" update
134137
"$ESCALATION_TOOL" "$PACKAGER" install -y brave-browser
135138
;;
136139
zypper)
137140
"$ESCALATION_TOOL" "$PACKAGER" install -y curl
138141
"$ESCALATION_TOOL" rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
139142
"$ESCALATION_TOOL" "$PACKAGER" addrepo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
143+
"$ESCALATION_TOOL" "$PACKAGER" refresh
140144
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install brave-browser
141145
;;
142146
pacman)
@@ -183,7 +187,6 @@ install_chromium() {
183187
"$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm chromium
184188
;;
185189
dnf)
186-
"$ESCALATION_TOOL" "$PACKAGER" install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
187190
"$ESCALATION_TOOL" "$PACKAGER" install -y chromium
188191
;;
189192
*)

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,11 @@ installTelegram() {
66
if ! command_exists telegram-desktop; then
77
printf "%b\n" "${YELLOW}Installing Telegram...${RC}"
88
case "$PACKAGER" in
9-
apt-get|nala)
10-
"$ESCALATION_TOOL" "$PACKAGER" -y install telegram-desktop
11-
;;
12-
zypper)
13-
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install telegram-desktop
14-
;;
159
pacman)
1610
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm telegram-desktop
1711
;;
18-
dnf)
19-
"$ESCALATION_TOOL" "$PACKAGER" install -y telegram-desktop
20-
;;
2112
*)
22-
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
23-
exit 1
13+
"$ESCALATION_TOOL" "$PACKAGER" install -y telegram-desktop
2414
;;
2515
esac
2616
else

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,11 @@ installThunderBird() {
66
if ! command_exists thunderbird; then
77
printf "%b\n" "${YELLOW}Installing Thunderbird...${RC}"
88
case "$PACKAGER" in
9-
apt-get|nala)
10-
"$ESCALATION_TOOL" "$PACKAGER" -y install thunderbird
11-
;;
12-
zypper)
13-
"$ESCALATION_TOOL" "$PACKAGER" --non-interactive install thunderbird
14-
;;
159
pacman)
1610
"$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm thunderbird
1711
;;
18-
dnf)
19-
"$ESCALATION_TOOL" "$PACKAGER" install -y thunderbird
20-
;;
2112
*)
22-
printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
23-
exit 1
13+
"$ESCALATION_TOOL" "$PACKAGER" install -y thunderbird
2414
;;
2515
esac
2616
else

0 commit comments

Comments
 (0)