Re-apply r336625 which was reverted with r336638, now that the underlying

[pw-darwin.git] / adduser / adduser.sh

diff --git a/adduser/adduser.sh b/adduser/adduser.sh
index 8e05f33c545d021fd29e3e70ee755d6c365d74ee..5f80d77f7ca65bfaa9fd3e986ccf63e535516901 100644 (file)
--- a/adduser/adduser.sh
+++ b/adduser/adduser.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
 # Copyright (c) 2002-2004 Michael Telahun Makonnen. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -488,6 +490,7 @@ get_uid() {
        _prompt=
 
        if [ -n "$uuid" ]; then
+               uuid=`get_nextuid $uuid`
                _prompt="Uid [$uuid]: "
        else
                _prompt="Uid (Leave empty for default): "
@@ -894,7 +897,7 @@ if [ "$procowner" != "0" ]; then
        exit 1
 fi
 
-# Overide from our conf file
+# Override from our conf file
 # Quickly go through the commandline line to see if we should read
 # from our configuration file. The actual parsing of the commandline
 # arguments happens after we read in our configuration file (commandline
@@ -914,7 +917,7 @@ if [ -n "$readconfig" ]; then
        fi
 fi 
 
-# Proccess command-line options
+# Process command-line options
 #
 for _switch ; do
        case $_switch in