Improved the testuser-setting code to try to get it to work
authorWayne Davison <wayned@samba.org>
Sun, 20 Feb 2005 16:27:10 +0000 (16:27 +0000)
committerWayne Davison <wayned@samba.org>
Sun, 20 Feb 2005 16:27:10 +0000 (16:27 +0000)
under solaris.

runtests.sh

index f5655e7..7b0654d 100755 (executable)
@@ -142,7 +142,13 @@ echo "$0 running in `pwd`"
 echo "    rsync_bin=$rsync_bin"
 echo "    srcdir=$srcdir"
 
-testuser=`id -un || whoami || echo UNKNOWN`
+if test -e /usr/bin/whoami; then
+    testuser=`/usr/bin/whoami`
+elif test -e /usr/ucb/whoami; then
+    testuser=`/usr/ucb/whoami`
+else
+    testuser=`id -un || whoami || echo UNKNOWN`
+fi
 
 echo "    testuser=$testuser"
 echo "    os=`uname -a`"