From c012b2026d4908e8533e6d3c3d8b89d36b11f168 Mon Sep 17 00:00:00 2001
From: Dan Fedele <dan.fedele@gmail.com>
Date: Mon, 12 Jun 2023 16:48:51 -0400
Subject: Now using ansible roles. also removed linpeass

---
 setup.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'setup.sh')

diff --git a/setup.sh b/setup.sh
index 2148bd8..10957ea 100644
--- a/setup.sh
+++ b/setup.sh
@@ -17,13 +17,6 @@ if [[ $EUID -ne 0 ]]; then
 fi
 
 PATH_TO_SCRIPT=$(dirname $(readlink -f $0))
-ZSH_FUNC_FILE="zsh_functions.zsh"
-TMUX_FILE="tmux_conf"
-
-if [[ ! -e ${PATH_TO_SCRIPT}/${ZSH_FUNC_FILE} ]] && [[ ! -e ${PATH_TO_SCRIPT}/${TMUX_FILE} ]]; then
-	echo "Cannot find supporting files! Please clone repository and try again!"
-	exit 3
-fi
 
 echo "***********************************"
 echo "*        Installing pip           *"
@@ -44,7 +37,7 @@ echo "***********************************"
 echo "*      Running Kali playbook      *"
 echo "***********************************"
 
-ansible-playbook ${PATH_TO_SCRIPT}/kali.yml --extra-vars "tmux=${PATH_TO_SCRIPT}/${TMUX_FILE} zsh_func=${PATH_TO_SCRIPT}/${ZSH_FUNC_FILE}"
+ansible-playbook ${PATH_TO_SCRIPT}/main.yml
 
 echo "***********************************"
 echo "*             Done!               *"
-- 
cgit v1.2.3


From 61d2136b432a041e5bf1dc04503fa5fb05a60631 Mon Sep 17 00:00:00 2001
From: Dan Fedele <dan.fedele@gmail.com>
Date: Mon, 12 Jun 2023 22:08:39 -0400
Subject: All set for merging, though need to document more next

---
 setup.sh | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'setup.sh')

diff --git a/setup.sh b/setup.sh
index 10957ea..d787460 100644
--- a/setup.sh
+++ b/setup.sh
@@ -10,34 +10,36 @@ if [ -z ${BASH} ]; then
 	exit 1
 fi
 
-# Are we root?
-if [[ $EUID -ne 0 ]]; then
-	echo "This script must be run as sudo or root."
+# Are we root? Because we shouldn't be.
+if [[ $EUID -eq 0 ]]; then
+	echo "This script should be run as a normal user, not root."
 	exit 2
 fi
 
 PATH_TO_SCRIPT=$(dirname $(readlink -f $0))
 
-echo "***********************************"
-echo "*        Installing pip           *"
-echo "***********************************"
+echo "************************************"
+echo "*         Installing pip           *"
+echo "************************************"
 
 curl -s https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
 python3 /tmp/get-pip.py --user --no-warn-script-location
 
-export PATH=$PATH:/root/.local/bin
+export PATH=$PATH:~/.local/bin
 
-echo "***********************************"
-echo "*       Installing ansible        *"
-echo "***********************************"
+echo "************************************"
+echo "*        Installing ansible        *"
+echo "************************************"
 
 pip install ansible
 
-echo "***********************************"
-echo "*      Running Kali playbook      *"
-echo "***********************************"
+echo "************************************"
+echo "*   Running Golden Kali Playbook   *"
+echo "************************************"
 
-ansible-playbook ${PATH_TO_SCRIPT}/main.yml
+echo
+echo "Please enter your password to configure system:"
+ansible-playbook ${PATH_TO_SCRIPT}/main.yml --ask-become-pass
 
 echo "***********************************"
 echo "*             Done!               *"
-- 
cgit v1.2.3