One more tweak to the "whoami" code.

13d00101 · Wayne Davison · 3e7934a5 · 13d00101
Commit 13d00101 authored Feb 20, 2005 by Wayne Davison
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

runtests.sh runtests.sh +3 -1

No files found.
--- a/runtests.sh
+++ b/runtests.sh
@@ -144,8 +144,10 @@ if [ -f /usr/bin/whoami ]; then
    testuser=`/usr/bin/whoami`
 elif [ -f /usr/ucb/whoami ]; then
    testuser=`/usr/ucb/whoami`
+elif [ -f /bin/whoami ]; then
+    testuser=`/bin/whoami`
 else
-    testuser=`id -un || whoami || echo ${LOGNAME:-${USERNAME:-${USER:-'UNKNOWN'}}}`
+    testuser=`id -un 2>/dev/null || echo ${LOGNAME:-${USERNAME:-${USER:-'UNKNOWN'}}}`
 fi

 echo "    testuser=$testuser"