From 65ab202b1551224c45a8476008a05bf4f3e6797e Mon Sep 17 00:00:00 2001
From: Alex <alex@ahubbard.xyz>
Date: Fri, 23 Dec 2022 22:07:58 -0600
Subject: [PATCH] modifications to aur-install.sh, move aur-programs.list to
 files

---
 .../arch/{scripts => files}/aur-programs.list |  1 +
 installers/arch/install.sh                    |  3 +-
 installers/arch/scripts/aur-install.sh        | 33 ++++++++++++-------
 3 files changed, 25 insertions(+), 12 deletions(-)
 rename installers/arch/{scripts => files}/aur-programs.list (94%)

diff --git a/installers/arch/scripts/aur-programs.list b/installers/arch/files/aur-programs.list
similarity index 94%
rename from installers/arch/scripts/aur-programs.list
rename to installers/arch/files/aur-programs.list
index 4ca76d1..5b06f23 100644
--- a/installers/arch/scripts/aur-programs.list
+++ b/installers/arch/files/aur-programs.list
@@ -19,3 +19,4 @@ wob
 tofi
 sway-audio-idle-inhibit-git
 shellcheck-bin
+librewolf-bin
diff --git a/installers/arch/install.sh b/installers/arch/install.sh
index d278342..da4ff73 100755
--- a/installers/arch/install.sh
+++ b/installers/arch/install.sh
@@ -139,7 +139,8 @@ read input
 [ "$input" = "y" ] && wireless
 
 echo "installing AUR packages..."
-sh ./scripts/aur-install.sh
+sh ./scripts/aur-install.sh ./files/aur-programs.list
+
 echo "Done installing AUR packages."
 echo ""
 
diff --git a/installers/arch/scripts/aur-install.sh b/installers/arch/scripts/aur-install.sh
index f50839b..a2bf3cf 100755
--- a/installers/arch/scripts/aur-install.sh
+++ b/installers/arch/scripts/aur-install.sh
@@ -1,21 +1,32 @@
 #!/bin/sh
 
+AUR_PROGS_FILE="$1"
 YAY_INSTALL_DIR="$HOME/.local/src/yay"
 
-[ -z "$AUR_PROGS_FILE" ] && AUR_PROGS_FILE="$PWD/aur-programs.list"
+yay_install() {
+    sudo pacman -S base-devel fakeroot
 
-aurprogs="$(cat "$AUR_PROGS_FILE")"
+    mkdir -p "$YAY_INSTALL_DIR"
+    git clone https://aur.archlinux.org/yay.git "$YAY_INSTALL_DIR" 
+    cd "$YAY_INSTALL_DIR"
+    makepkg -si
+}
 
-sudo pacman -S base-devel fakeroot
+pkg_install() {
+    aurprogs="$(cat "$AUR_PROGS_FILE")"
+    for pkg in $aurprogs
+    do
+        yay -S "$pkg"
+    done
+}
 
-mkdir -p "$YAY_INSTALL_DIR"
-git clone https://aur.archlinux.org/yay.git "$YAY_INSTALL_DIR" 
-cd "$YAY_INSTALL_DIR"
-makepkg -si
+if [ -f "$AUR_PROGS_FILE" ]; then 
 
-for pkg in $aurprogs
-do
-    yay -S "$pkg"
+    ! [ -f "/usr/bin/yay" ] && yay_install
 
-done
+    pkg_install
+
+else
+    echo "enter file containing package names to install separated by newlines as first input argument" && exit
+fi