From: Wayne Davison <wayned@samba.org>
Date: Sun, 20 Feb 2005 21:04:03 +0000 (+0000)
Subject: One more tweak to the "whoami" code.
X-Git-Tag: v2.6.4pre1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13d00101e808ebfc327f8c5e830b96303facf31f;p=thirdparty%2Frsync.git

One more tweak to the "whoami" code.
---

diff --git a/runtests.sh b/runtests.sh
index 85030d0b..c4c4137f 100755
--- 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"