Improving Run Script

Author: NerdOfCode

Src/global_bash_var

@@ -9,6 +9,10 @@ DEFAULT_LOCATION="/etc/Restricted-Shell/"
 #Define last-updated date
 LAST_UPDATED="10/28/18"
 
+#Check if any updates via git everytime "run.sh" is ran
+#Default: Off
+updates=0
+
 #Define colors for color-coating output
 RED_TEXT='\033[0;31m'
 RESET='\033[0m'

reinstall.sh

@@ -18,7 +18,7 @@ root_check(){
 
         if [[ "$(whoami)" != "root" ]]
         then
-                echo "This script will most likely need root."
+                echo "Error: Not Root!"
                 echo "Pass '--no-root' if you're willing to risk it."
                 exit -1
         fi

run.sh

@@ -26,34 +26,51 @@
 #Source the global_bash_var file
 source Src/global_bash_var
 
-#Change to 0 to turn auto updates off
-updates=0
-
+#If file exists, don't prompt user for start-configuration
 config=".config"
 
 #Change to 1 if you don't want to recompile if built
 dont_compile=0
 
-##Where users are stored
-##UNUSED AS OF 7/10/18
-user_db="Logs/users.db"
-
 ##FOR COLOR COATING
 RED='\033[0;41m'
 YELLOW='\e[0;33m'
 
 RESET='\033[0;37m'
 
-
 if [[ "$updates" == "1" ]]
 then
-	echo "Updating repository..."
+ 	echo "Updating repository..."
 	git pull origin master
 fi
 
 #Shortcut to make sure all shell scripts are in fact executable
 chmod +x Bin/*
 
+help(){
+	#If --help flag is thrown
+	echo "Below are the available options:"
+	echo "		--help -> Display this help menu"
+	echo "		--reinstall -> Display reinstallation instructions"
+	echo "		--update -> Update the R-Shell via Git"
+
+	exit 0
+}
+
+reinstall(){
+	#If --reinstall flag is thrown
+	echo "Please run: "
+	echo "		bash reinstall.sh"
+	exit 0
+}
+
+check_updates(){
+	#If --update flag is thrown
+	echo "Attempting to update..."
+	git pull origin master
+	exit 0
+}
+
 check_commands(){
 
 	exit_status=0
@@ -127,37 +144,26 @@ sign_in(){
 	fi
 
 }
-create_admin_acc(){
 
-	sqlite3 $user_db "CREATE TABLE IF NOT EXISTS users ( id INTEGER PRIMARY KEY AUTOINCREMENT, username TEXT NOT NULL, password TEXT NOT NULL);"
+#Run through args
 
-	status=$(sqlite3 $user_db "SELECT id FROM users WHERE id=1;")
-	admin_count=$(sqlite3 $user_db "SELECT id FROM users;")
-
-	#echo "Local Admins: ${admin_count: -1}"
-
-	if [ "$status" == "1" ]
+for arg in "$@"
+do
+	if [[ "$arg" == "--help" ]]
 	then
-		echo "You will need to be signed in by an exisiting administrator! "
-		sign_in
+		help
 	fi
 
-	if [[ $add_admin != 0 ]]
-	then
-		printf "${RED}One More Thing! It is Time to setup the Admin account!\n"
-		printf "Enter the following information!${RESET}\n"
-	
-		read -p "Enter Username: " username
-		read -p "Enter Password: " password
+        if [[ "$arg" == "--reinstall" ]]
+        then
+                reinstall
+        fi
 
-		password="$(echo \"$password\" | sha512sum | awk -F ' ' '{print $1}' )"	
-		echo $password
-		sqlite3 $user_db "INSERT INTO users(username,password) VALUES(\"$username\", \"$password\");"
+	if [[ "$arg" == "--update" ]]
+	then
+		check_updates
 	fi
-
-}
-
-clear
+done
 
 check_commands
 
@@ -267,8 +273,6 @@ fi
 
 clear
 
-#create_admin_acc
-
 check_exec
 
 if [[ $dont_compile -eq 0 ]]