浏览代码

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

deimosian 2 天之前
父节点
当前提交
b92874c716
共有 1 个文件被更改,包括 7 次插入6 次删除
  1. 7 6
      plugins/archlinux/archlinux.plugin.zsh

+ 7 - 6
plugins/archlinux/archlinux.plugin.zsh

@@ -178,26 +178,27 @@ fi
 
 
 # Check Arch Linux PGP Keyring before System Upgrade to prevent failure.
 # Check Arch Linux PGP Keyring before System Upgrade to prevent failure.
 function upgrade() {
 function upgrade() {
+  sudo pacman -Sy
   echo ":: Checking Arch Linux PGP Keyring..."
   echo ":: Checking Arch Linux PGP Keyring..."
   local installedver="$(LANG= sudo pacman -Qi archlinux-keyring | grep -Po '(?<=Version         : ).*')"
   local installedver="$(LANG= sudo pacman -Qi archlinux-keyring | grep -Po '(?<=Version         : ).*')"
   local currentver="$(LANG= sudo pacman -Si archlinux-keyring | grep -Po '(?<=Version         : ).*')"
   local currentver="$(LANG= sudo pacman -Si archlinux-keyring | grep -Po '(?<=Version         : ).*')"
   if [ $installedver != $currentver ]; then
   if [ $installedver != $currentver ]; then
     echo " Arch Linux PGP Keyring is out of date."
     echo " Arch Linux PGP Keyring is out of date."
     echo " Updating before full system upgrade."
     echo " Updating before full system upgrade."
-    sudo pacman -Sy --needed --noconfirm archlinux-keyring
+    sudo pacman -S --needed --noconfirm archlinux-keyring
   else
   else
     echo " Arch Linux PGP Keyring is up to date."
     echo " Arch Linux PGP Keyring is up to date."
     echo " Proceeding with full system upgrade."
     echo " Proceeding with full system upgrade."
   fi
   fi
   if (( $+commands[yay] )); then
   if (( $+commands[yay] )); then
-    yay -Syu
+    yay -Su
   elif (( $+commands[trizen] )); then
   elif (( $+commands[trizen] )); then
-    trizen -Syu
+    trizen -Su
   elif (( $+commands[pacaur] )); then
   elif (( $+commands[pacaur] )); then
-    pacaur -Syu
+    pacaur -Su
   elif (( $+commands[aura] )); then
   elif (( $+commands[aura] )); then
-    sudo aura -Syu
+    sudo aura -Su
   else
   else
-    sudo pacman -Syu
+    sudo pacman -Su
   fi
   fi
 }
 }