Simplify detection of next usable user ID

[usertools.macosx.git] / useradd.macosx.sh

diff --git a/useradd.macosx.sh b/useradd.macosx.sh
index 518aef341413a2cedd7ec7ca53567645bc6e8733..252ff941b619913926e38b12a20028966b623692 100755 (executable)
--- a/useradd.macosx.sh
+++ b/useradd.macosx.sh
@@ -111,6 +111,8 @@ done
 [ -n "$home_dir" ] || home_dir="/Users/$user_name"
 [ -n "$shell" ] || shell="/bin/bash"
 
+[ "$UID" -eq 0 ] || Abort "This script must be run as root!"
+
 # Check that directory services are running
 launchctl list 2>/dev/null | fgrep "com.apple.DirectoryServices" >/dev/null 2>&1
 if [ $? -ne 0 ]; then
@@ -126,13 +128,8 @@ fi
 # No user ID given, generate it
 if [ $user_id -lt 0 ]; then
        # search next free user ID
-       declare -i new_id=501
-       id "$new_id" >/dev/null 2>&1
-       while [ $? -eq 0 ]; do
-               new_id=$new_id+1;
-               id "$new_id" >/dev/null 2>&1
-       done
-       user_id=$new_id
+       user_id=`echo $[$(dscl . -list /Users uid | awk '{print $2}' \
+               | sort -n | tail -n1)+1]`
 fi
 
 # Validate user name, user id and group id
@@ -168,7 +165,7 @@ dscl . -create /Users/"$user_name" PrimaryGroupID "$group_id" || Abort
 dscl . -create /Users/"$user_name" NFSHomeDirectory "$home_dir" || Abort
 dscl . -create /Users/"$user_name" UserShell "$shell" || Abort
 dscl . -create /Users/"$user_name" RealName "$real_name" || Abort
-dscl . -passwd /Users/"$user_name" "maccc" || Abort
+#dscl . -passwd /Users/"$user_name" "maccc" || Abort
 if [ "$become_admin" -ne 0 ]; then
        [ "$verbose" -ne 0 ] && echo "Adding user to 'admin' group ..."
        dscl . -append /Groups/admin GroupMembership "$user_name" || Abort
@@ -184,4 +181,4 @@ chmod 755 "$home_dir" || Abort
 echo "User '$user_name' ($user_id) has been created."
 exit 0
 
-# -eof-
\ No newline at end of file
+# -eof-