From e826c5981224f224686fe1e6dc298fc921c0dcac Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Wed, 22 Dec 2021 12:28:04 -0300
Subject: [PATCH] Check for dependencies

---
 scripts/bootstrap.sh | 16 ++++++++++++-
 scripts/install.sh   | 53 ++++++++++++++++++++++----------------------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 331299b..8e0335c 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -22,7 +22,21 @@ getGitconfigData() {
     sed -e "s/WORK_NAME/$gitWorkName/g" -e "s/WORK_MAIL/$gitWorkMail/g" ./templates/.gitconfig-work > ./dotfiles/.gitconfig-work
 }
 
+checkForDependencies() {
+    unameOutput=$(uname -a | grep "arch")
+    if [ -f "/etc/arch-release" ] || [ $unameOutput -eq 0 ]; then
+        pacman --noconfirm --needed -Sy dialog > /dev/null 2>&1 || echo "You must run this script as root and have an active internet connection." >&2 || exit 1
+    fi
+
+    commOuput=$(command -v dialog &> /dev/null)
+    if [ $? -eq 1 ]; then
+        echo "You must install dialog." >&2 || exit 1
+    fi
+}
+
 startRice() {
+    checkForDependencies
+
     lastFolder=$(pwd -P)
     cocoRiceFolder=$(echo "$(pwd -P)" | awk '{ sub(/CocoRice.*/, "CocoRice"); print }')
     cd $cocoRiceFolder
@@ -30,7 +44,7 @@ startRice() {
     dialog --title "CocoRice" --msgbox "Hi! This script will auto install my dotfiles. Make sure to backup your dotfiles!" 10 60
     getGitconfigData
     ./scripts/linkFiles.sh
-    ./scripts/install.sh
+    # ./scripts/install.sh
     dialog --title "CocoRice" --msgbox "All done! Enjoy..." 10 60
 
     clear
diff --git a/scripts/install.sh b/scripts/install.sh
index 7b019de..e36f9ef 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -1,33 +1,32 @@
 #!/bin/sh
 
-DOTFILES_CONFIG=$HOME/test/.config
+makeInstall() {
+    cd $1
+    make install
+    cd ..
+}
 
-cd $DOTFILES_CONFIG
+downloadAndInstallPackages() {
+    DOTFILES_CONFIG=$HOME/test/.config
 
-downloaded=false
+    cd $DOTFILES_CONFIG
 
-if [[ ! -d "dwmblocks" ]]; then
-    git clone --progress https://github.com/santilococo/dwmblocks.git 2>&1 | dialog --progressbox "Downloading dwmblocks" 10 60
-    downloaded=true
-fi
-if [[ ! -d "dwm" ]]; then
-    git clone --progress https://github.com/santilococo/dwm.git 2>&1 | dialog --progressbox "Downloading dwm" 10 60
-    downloaded=true
-fi
-if [[ ! -d "st" ]]; then
-    git clone --progress https://github.com/santilococo/st.git 2>&1 | dialog --progressbox "Downloading st" 10 60
-    downloaded=true
-fi
-if [[ ! -d "dmenu" ]]; then
-    git clone --progress https://github.com/santilococo/dmenu.git 2>&1 | dialog --progressbox "Downloading dmenu" 10 60
-    downloaded=true
-fi
+    if [[ ! -d "dwmblocks" ]]; then
+        git clone --progress https://github.com/santilococo/dwmblocks.git 2>&1 | dialog --progressbox "Downloading dwmblocks" 10 60
+        makeInstall "dwmblocks"
+    fi
+    if [[ ! -d "dwm" ]]; then
+        git clone --progress https://github.com/santilococo/dwm.git 2>&1 | dialog --progressbox "Downloading dwm" 10 60
+        makeInstall "dwm"
+    fi
+    if [[ ! -d "st" ]]; then
+        git clone --progress https://github.com/santilococo/st.git 2>&1 | dialog --progressbox "Downloading st" 10 60
+        makeInstall "st"
+    fi
+    if [[ ! -d "dmenu" ]]; then
+        git clone --progress https://github.com/santilococo/dmenu.git 2>&1 | dialog --progressbox "Downloading dmenu" 10 60
+        makeInstall "dmenu"
+    fi
+}
 
-if [ downloaded = true ]; then
-    sudo echo -n
-fi
-
-#cd dwmblocks && sudo make install
-#cd dwm && sudo make install
-#cd st && sudo make install
-#cd dmenu && sudo make install
+downloadAndInstallPackages
\ No newline at end of file