From 6f0efe48bb0a43ac20b09d4dbc0691b4ea09030b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Roberto=20S=C3=A1nchez?=
 <jose_roberto_ss@hotmail.com>
Date: Sun, 6 Nov 2022 00:28:10 -0600
Subject: [PATCH] Requirements moved and added which. Adding yay install

---
 setup.sh | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/setup.sh b/setup.sh
index 9347ea1..212a6aa 100644
--- a/setup.sh
+++ b/setup.sh
@@ -6,8 +6,15 @@ YELLOW='\e[33m'
 GREEN='\e[32m'
 
 checkEnv() {
+    ## Check for requirements.
+    REQUIREMENTS='curl groups sudo which'
+    if ! which ${REQUIREMENTS} >/dev/null; then
+        echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
+        exit 1
+    fi
+
     ## Check Package Handeler
-    PACKAGEMANAGER='apt dnf'
+    PACKAGEMANAGER='apt dnf pacman'
     for pgm in ${PACKAGEMANAGER}; do
         if which ${pgm} >/dev/null; then
             PACKAGER=${pgm}
@@ -28,13 +35,6 @@ checkEnv() {
         exit 1
     fi
 
-    ## Check for requirements.
-    REQUIREMENTS='curl groups sudo'
-    if ! which ${REQUIREMENTS} >/dev/null; then
-        echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
-        exit 1
-    fi
-
     ## Check SuperUser Group
     SUPERUSERGROUP='wheel sudo'
     for sug in ${SUPERUSERGROUP}; do
@@ -56,7 +56,18 @@ installDepend() {
     ## Check for dependencies.
     DEPENDENCIES='autojump bash bash-completion tar neovim'
     echo -e "${YELLOW}Installing dependencies...${RC}"
-    sudo ${PACKAGER} install -yq ${DEPENDENCIES}
+    if [[ $PACKAGER -eq "pacman" ]]; then
+        YAY_CMD==$(which yay)
+        if [[ -z $YAY_CMD ]]; then
+            echo "Installing yay..."
+            sudo ${PACKAGER} --noconfirm -S base-devel
+            $(cd /opt && sudo git clone https://aur.archlinux.org/yay-git.git && sudo chown -R ${USER}:${USER} ./yay-git)
+            makepkg -si
+        fi
+    	sudo yay --noconfirm -S ${DEPENDENCIES}
+    else 
+    	sudo ${PACKAGER} install -yq ${DEPENDENCIES}
+    fi
 }
 
 installStarship(){