From 6543392358c6ad0203b0ff6578ecfd2ba0d84cb3 Mon Sep 17 00:00:00 2001
From: deimosian <deimosian@gmail.com>
Date: Sun, 16 Feb 2025 01:59:30 -0500
Subject: [PATCH 1/3] Actually check repo version

Actually check repo version of keyring package on first run of upgrade...
---
 plugins/archlinux/archlinux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index e20a31156..66efef284 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -180,7 +180,7 @@ fi
 function upgrade() {
   echo ":: Checking Arch Linux PGP Keyring..."
   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 -Syi archlinux-keyring | grep -Po '(?<=Version         : ).*')"
   if [ $installedver != $currentver ]; then
     echo " Arch Linux PGP Keyring is out of date."
     echo " Updating before full system upgrade."

From 5858f90d801e555367b375432a955ffa886e95f3 Mon Sep 17 00:00:00 2001
From: deimosian <deimosian@gmail.com>
Date: Sun, 16 Feb 2025 06:48:17 -0500
Subject: [PATCH 2/3] Remove additional -y

---
 plugins/archlinux/archlinux.plugin.zsh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 66efef284..fa4f93b02 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -184,20 +184,20 @@ function upgrade() {
   if [ $installedver != $currentver ]; then
     echo " Arch Linux PGP Keyring is out of date."
     echo " Updating before full system upgrade."
-    sudo pacman -Sy --needed --noconfirm archlinux-keyring
+    sudo pacman -S --needed --noconfirm archlinux-keyring
   else
     echo " Arch Linux PGP Keyring is up to date."
     echo " Proceeding with full system upgrade."
   fi
   if (( $+commands[yay] )); then
-    yay -Syu
+    yay -Su
   elif (( $+commands[trizen] )); then
-    trizen -Syu
+    trizen -Su
   elif (( $+commands[pacaur] )); then
-    pacaur -Syu
+    pacaur -Su
   elif (( $+commands[aura] )); then
-    sudo aura -Syu
+    sudo aura -Su
   else
-    sudo pacman -Syu
+    sudo pacman -Su
   fi
 }

From 6394b6e6b70a02e97f445208174ad8eab1a4ea19 Mon Sep 17 00:00:00 2001
From: deimosian <deimosian@gmail.com>
Date: Mon, 17 Feb 2025 11:09:23 -0500
Subject: [PATCH 3/3] Independent package database update

---
 plugins/archlinux/archlinux.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index fa4f93b02..7abd7c2f6 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -178,9 +178,10 @@ fi
 
 # Check Arch Linux PGP Keyring before System Upgrade to prevent failure.
 function upgrade() {
+  sudo pacman -Sy
   echo ":: Checking Arch Linux PGP Keyring..."
   local installedver="$(LANG= sudo pacman -Qi archlinux-keyring | grep -Po '(?<=Version         : ).*')"
-  local currentver="$(LANG= sudo pacman -Syi archlinux-keyring | grep -Po '(?<=Version         : ).*')"
+  local currentver="$(LANG= sudo pacman -Si archlinux-keyring | grep -Po '(?<=Version         : ).*')"
   if [ $installedver != $currentver ]; then
     echo " Arch Linux PGP Keyring is out of date."
     echo " Updating before full system upgrade."