From ed065e69913cc5465d6aa26691bb3ff545ce68b2 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Mon, 15 Jul 2024 09:41:02 +0200
Subject: [PATCH] Automatically install enumerated software

---
 scripts/Arch/Scripts/software.fish         | 4 ++--
 scripts/Arch/Software/base-devel/main.fish | 2 +-
 scripts/Arch/Software/pacman/main.fish     | 2 +-
 scripts/Arch/Software/yay/main.fish        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/Arch/Scripts/software.fish b/scripts/Arch/Scripts/software.fish
index 2bd058f6..2efed161 100644
--- a/scripts/Arch/Scripts/software.fish
+++ b/scripts/Arch/Scripts/software.fish
@@ -4,10 +4,10 @@ begin
     source "$dir/../../Common/Scripts/software.fish"
 
     function yayinst -d "Install yay-package non-interactively"
-        yay --noconfirm --needed --answerclean=None --answerdiff=None $argv
+        yay --noconfirm --needed --answerclean=None --answerdiff=None -Syu $argv
     end
 
     function pacinst -d "Install pacman-package non-interactively"
-        sudo pacman --noconfirm --needed $argv
+        sudo pacman --noconfirm --needed -Syu $argv
     end
 end
diff --git a/scripts/Arch/Software/base-devel/main.fish b/scripts/Arch/Software/base-devel/main.fish
index 2dd058df..7322c5a6 100644
--- a/scripts/Arch/Software/base-devel/main.fish
+++ b/scripts/Arch/Software/base-devel/main.fish
@@ -4,7 +4,7 @@ begin
     source "$dir/../../Scripts/software.fish"
 
     function installSW
-        pacinst -Syu base-devel
+        pacinst base-devel
         configureSW
     end
 
diff --git a/scripts/Arch/Software/pacman/main.fish b/scripts/Arch/Software/pacman/main.fish
index 5f7f7ff1..8d357ec4 100644
--- a/scripts/Arch/Software/pacman/main.fish
+++ b/scripts/Arch/Software/pacman/main.fish
@@ -19,7 +19,7 @@ begin
             -e '/^#\?\[multilib\]$/,/^$/{ s/^#\?\(.*\)$/\1/; }' \
             /etc/pacman.conf
 
-        pacinst -Sy
+        pacman -Sy
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/yay/main.fish b/scripts/Arch/Software/yay/main.fish
index 9da5bcd7..4a08ab75 100644
--- a/scripts/Arch/Software/yay/main.fish
+++ b/scripts/Arch/Software/yay/main.fish
@@ -6,7 +6,7 @@ begin
     function installSW
         if not type -q yay
             set -l contextRoot (mktemp -d)
-            pacinst -Syu git
+            pacinst git
             git clone https://aur.archlinux.org/yay.git "$contextRoot"
 
             pushd "$contextRoot" > /dev/null