From c4523cd9875151b24927cff3029229be26dd0cc0 Mon Sep 17 00:00:00 2001
From: 71Zombie <76274154+71Zombie@users.noreply.github.com>
Date: Tue, 26 Oct 2021 07:59:10 -0400
Subject: [PATCH] Proper directory + cleaning

---
 3-post-setup.sh | 12 ------------
 4-pen-tools.sh  | 21 +++++++++++++++++----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/3-post-setup.sh b/3-post-setup.sh
index 2a72fa0..eec4c09 100644
--- a/3-post-setup.sh
+++ b/3-post-setup.sh
@@ -43,15 +43,3 @@ sudo systemctl disable dhcpcd.service
 sudo systemctl stop dhcpcd.service
 sudo systemctl enable NetworkManager.service
 sudo systemctl enable bluetooth
-echo "
-###############################################################################
-# Cleaning
-###############################################################################
-"
-# Remove no password sudo rights
-sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers
-# Add sudo rights
-sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
-
-# Replace in the same state
-cd $pwd
diff --git a/4-pen-tools.sh b/4-pen-tools.sh
index d35993d..064e6b4 100644
--- a/4-pen-tools.sh
+++ b/4-pen-tools.sh
@@ -29,28 +29,41 @@ for PKG in "${PKGS[@]}"; do
     sudo pacman -S "$PKG" --noconfirm --needed
 done
 
-cd ~/git
+
 echo -e "\nInstalling git repositories\n"
+mkdir $HOME/git
+cd $HOME/git
 git clone https://github.com/six2dez/reconftw.git
 cd reconftw/
 ./install.sh
 
-cd ~/git
+cd $HOME/git
 git clone https://github.com/codingo/Reconnoitre.git
 python3 setup.py install
 
-cd ~/git
+cd $HOME/git
 git clone https://github.com/AlisamTechnology/ATSCAN
 chmod +x ./install.sh
 ./install.sh
 
-cd ~/git
+cd $HOME/git
 git clone https://github.com/evyatarmeged/Raccoon.git
 cd Raccoon
 python setup.py install # Subsequent changes to the source code will not be reflected in calls to raccoon when this is used
 
 
+echo "
+###############################################################################
+# Cleaning
+###############################################################################
+"
+# Remove no password sudo rights
+sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers
+# Add sudo rights
+sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
 
+# Replace in the same state
+cd $pwd
 
 echo "
 ###############################################################################