|
|
@@ -181,18 +181,22 @@ else
|
|
|
fi
|
|
|
|
|
|
# determine current run-time user
|
|
|
-user="$LOGNAME"
|
|
|
+user="`(whoami) 2>/dev/null | awk '{ printf("%s", $1); }'`"
|
|
|
if [ ".$user" = . ]; then
|
|
|
- user="$USER"
|
|
|
+ user="`(who am i) 2>/dev/null | awk '{ printf("%s", $1); }'`"
|
|
|
if [ ".$user" = . ]; then
|
|
|
- user="`(whoami) 2>/dev/null | awk '{ printf("%s", $1); }'`"
|
|
|
+ user="$LOGNAME"
|
|
|
+ fi
|
|
|
+ if [ ".$user" = . ]; then
|
|
|
+ echo "$0:ERROR: unable to determine current username" 1>&2
|
|
|
if [ ".$user" = . ]; then
|
|
|
- user="`(who am i) 2>/dev/null | awk '{ printf("%s", $1); }'`"
|
|
|
+ user="$USER"
|
|
|
if [ ".$user" = . ]; then
|
|
|
echo "$0:ERROR: unable to determine current username" 1>&2
|
|
|
exit 1
|
|
|
fi
|
|
|
fi
|
|
|
+ exit 1
|
|
|
fi
|
|
|
fi
|
|
|
|