Cleanup user scripts

This commit is contained in:
2023-04-06 16:51:21 -04:00
parent 2efeb4e887
commit 1bde2a2478
2 changed files with 6 additions and 5 deletions

View File

@@ -11,15 +11,16 @@ is_root
echo "$@" echo "$@"
[[ $# -lt 1 ]] && echo "No username provided!" && exit 1 [[ $# -eq 0 ]] && echo "No username provided!" && exit 1
[[ $# -eq 1 ]] && username="$1" && password="$username" [[ $# -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") useradd_cmd=("useradd" "-m" "-U")
if id -u "$username"; then if id -u "$username"; then
ask_ok "User $username exists. Run script-user-remove?" || exit $? ask_ok "User $username exists. Run script-user-remove?" || exit $?
./script-user-remove "$username" || exit $? "$parent"/script-user-remove "$username" || exit $?
fi fi
ask_ok "Create user $username with password $password?" || exit $? 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 # Copy manual to user desktop
mkdir -p /home/"$username"/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 chown "$username":"$username" -R /home/"$username"/Desktop
exit $? exit $?

View File

@@ -7,7 +7,7 @@ parent=${parent%/*}
unset user unset user
[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1 [[ -f $parent/functions ]] && . "$parent"/functions || exit 1
is_root is_root