From 1bde2a2478ae033c8302f50123287efc6c45ec17 Mon Sep 17 00:00:00 2001
From: Bryan Roessler <bryanroessler@gmail.com>
Date: Thu, 6 Apr 2023 16:51:21 -0400
Subject: [PATCH] Cleanup user scripts

---
 script-user-add    | 9 +++++----
 script-user-remove | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/script-user-add b/script-user-add
index 3cbe8f41..f0087e06 100755
--- a/script-user-add
+++ b/script-user-add
@@ -11,15 +11,16 @@ is_root
 
 echo "$@"
 
-[[ $# -lt 1 ]] && echo "No username provided!" && exit 1
+[[ $# -eq 0 ]] && echo "No username provided!" && exit 1
 [[ $# -eq 1 ]] && username="$1" && password="$username"
-[[ $# -ge 2 ]] && username="$1" && password="$2"
+[[ $# -eq 2 ]] && username="$1" && password="$2"
+[[ $# -gt 2 ]] && echo "Too many arguments provided" && exit 1
 
 useradd_cmd=("useradd" "-m" "-U")
 
 if id -u "$username"; then
     ask_ok "User $username exists. Run script-user-remove?" || exit $?
-    ./script-user-remove "$username" || exit $?
+    "$parent"/script-user-remove "$username" || exit $?
 fi
 
 ask_ok "Create user $username with password $password?" || exit $?
@@ -65,7 +66,7 @@ echo "$username:$start_gid:$id_num" >> /etc/subgid
 
 # Copy manual to user desktop
 mkdir -p /home/"$username"/Desktop/
-ln -fs README.html /home/"$username"/Desktop/
+ln -fs "$parent"/README.html /home/"$username"/Desktop/
 chown "$username":"$username" -R /home/"$username"/Desktop
 
 exit $?
diff --git a/script-user-remove b/script-user-remove
index 10673fb2..0339fd4d 100755
--- a/script-user-remove
+++ b/script-user-remove
@@ -7,7 +7,7 @@ parent=${parent%/*}
 
 unset user
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f $parent/functions ]] && . "$parent"/functions || exit 1
 
 is_root