Minor improvements and fixes

Was missing a few forgotten variables

autouser.sh

@@ -90,25 +90,27 @@ createUser() {
 }
 
 deleteGroup() {
-  if [[ "$DRYRUN" == true ]]; then
+  COMMAND=""
-    read -p "Enter group name: " GROUPNAME
+  if [[ "$DRYRUN" == false ]]; then
-    echo "groupadd $GROUPNAME"
-  else
     rootCheck
-    read -p "Enter group name: " GROUPNAME
+    COMMAND="groupdel"
-    groupadd $GROUPNAME
+  else
+    COMMAND="echo groupdel"
   fi
+    read -p "Enter group name: " GROUPNAME
+    $COMMAND $GROUPNAME
 }
 
 deleteUser() {
-  if [[ "$DRYRUN" == true ]]; then
+  COMMAND=""
-    read -p "Enter username: " USERNAME
+  if [[ "$DRYRUN" == false ]]; then
-    echo "userdel -r $USERNAME"
-  else
     rootCheck
-    read -p "Enter username: " USERNAME
+    COMMAND="userdel"
-    userdel -r $USERNAME
+  else
+    COMMAND="echo userdel"
   fi
+  read -p "Enter username: " USERNAME
+  $COMMAND -r $USERNAME
 }
 
 rootCheck ()
@@ -238,25 +240,20 @@ createUsers ()
 deleteUsers ()
 {
   checkFile
+  COMMAND=""
   if [[ "$DRYRUN" == false ]]; then
     rootCheck
-    USERADDER="useradd"
+    USERDELER="userdel"
-    CHFNER="chfn"
+    GROUPDELER="groupdel"
   else
-    USERADDER="echo useradd"
+    USERDELER="echo userdel"
-    CHFNER="echo chfn"
+    GROUPDELER="echo groupdel"
-    USERMOD="echo usermod"
   fi
   while read line; do
     USERNAME=$(turnLowercase $(cutter "${line}" "$COL_USERNAME"))
     echo "[+] Deleting user $USERNAME..."
-    if [[ "$DRYRUN" == true ]]; then
+    $USERDELER -r $USERNAME 2>/dev/null
-      echo "userdel -r $USERNAME"
+    $GROUPDELER $USERNAME 2>/dev/null
-      echo "groupdel $USERNAME"
-    else
-      userdel -r $USERNAME 2>/dev/null
-      groupdel $USERNAME 2>/dev/null
-    fi
   done <<< "$FILE_CONTENTS"
 }
 
@@ -295,6 +292,11 @@ do
   fi
 done
 
+if [[ "$ACTION_TO_TAKE" == "" ]]; then
+  usage
+  exit
+fi
+
 case "$ACTION_TO_TAKE" in
   create-groups)
     createGroups
@@ -320,10 +322,16 @@ case "$ACTION_TO_TAKE" in
     createUser
     exit
     ;;
+  delete-group)
+    deleteGroup
+    exit
+    ;;
+  delete-user)
+    deleteUser
+    exit
+    ;;
   *)
     echo "Invalid parameter! Exiting..."
     exit
     ;;
 esac
-
-usage