From de91cb7bfb38a9ad14f2f4c614cbcef51e5c8e69 Mon Sep 17 00:00:00 2001 From: Jonas Date: Sat, 16 Nov 2013 16:42:12 +0100 Subject: Avoid sudo when executing as root. --- localadduser | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'localadduser') diff --git a/localadduser b/localadduser index 213d4d9..576714b 100755 --- a/localadduser +++ b/localadduser @@ -120,12 +120,15 @@ if [ ! "$interactive" -gt 0 ]; then quiet="--quiet" fi +sudo=sudo +[ "$(id -u)" -ne 0 ] || sudo= + # adduser is too pessimistic on --gecos size -eval $simulate sudo "/usr/sbin/adduser $quiet --disabled-login --gecos \"\" \"$u\"" -eval $simulate sudo "/usr/sbin/usermod -c \"$fullname,$office,$office_phone,$home_phone,$other\" \"$u\"" +eval $simulate $sudo "/usr/sbin/adduser $quiet --disabled-login --gecos \"\" \"$u\"" +eval $simulate $sudo "/usr/sbin/usermod -c \"$fullname,$office,$office_phone,$home_phone,$other\" \"$u\"" for group in $groups; do - eval $simulate sudo "/usr/sbin/adduser $quiet \"$u\" \"$group\"" + eval $simulate $sudo "/usr/sbin/adduser $quiet \"$u\" \"$group\"" done eval $simulate localresetpasswd "$u" -- cgit v1.2.3