b92874c716776bc8a19773d12354b77d08349d7b

Author
deimosian <616215+deimosian@users.noreply.github.com>
Committer
GitHub <noreply@github.com>
Date

Message

fix(archlinux): properly check keyring version (#12979)

Diff

 1diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
 2index e20a3115665ab3c72ec277f6c22981c00d44d922..7abd7c2f634f8c69587a76ea7b4c1a7b5172fbad 100644
 3--- a/plugins/archlinux/archlinux.plugin.zsh
 4+++ b/plugins/archlinux/archlinux.plugin.zsh
 5@@ -178,26 +178,27 @@ fi
 6 
 7 # Check Arch Linux PGP Keyring before System Upgrade to prevent failure.
 8 function upgrade() {
 9+  sudo pacman -Sy
10   echo ":: Checking Arch Linux PGP Keyring..."
11   local installedver="$(LANG= sudo pacman -Qi archlinux-keyring | grep -Po '(?<=Version         : ).*')"
12   local currentver="$(LANG= sudo pacman -Si archlinux-keyring | grep -Po '(?<=Version         : ).*')"
13   if [ $installedver != $currentver ]; then
14     echo " Arch Linux PGP Keyring is out of date."
15     echo " Updating before full system upgrade."
16-    sudo pacman -Sy --needed --noconfirm archlinux-keyring
17+    sudo pacman -S --needed --noconfirm archlinux-keyring
18   else
19     echo " Arch Linux PGP Keyring is up to date."
20     echo " Proceeding with full system upgrade."
21   fi
22   if (( $+commands[yay] )); then
23-    yay -Syu
24+    yay -Su
25   elif (( $+commands[trizen] )); then
26-    trizen -Syu
27+    trizen -Su
28   elif (( $+commands[pacaur] )); then
29-    pacaur -Syu
30+    pacaur -Su
31   elif (( $+commands[aura] )); then
32-    sudo aura -Syu
33+    sudo aura -Su
34   else
35-    sudo pacman -Syu
36+    sudo pacman -Su
37   fi
38 }