Fix parsing of cmdline -os & -pr options. Bug 2538

[exim.git] / test / aux-fixed / showenv

diff --git a/test/aux-fixed/showenv b/test/aux-fixed/showenv
index a49833adab3d9d0e201eeae3a2cea405c8a3c6fd..69c8ee006b44fa46dfa736edb995eaa388924910 100755 (executable)
--- a/test/aux-fixed/showenv
+++ b/test/aux-fixed/showenv
@@ -3,8 +3,12 @@
 # This script outputs certain information about the environment, for use when
 # testing pipe transports.
 
+cmd=/usr/xpg4/bin/id
+[ -x $cmd ] || cmd=id
+name=`$cmd -un`
+
 echo Test pipe script
-echo Running as: `whoami`
+echo Running as: $name
 echo ------------------
 echo Args:
 while [ "$1" != "" ]; do
@@ -12,7 +16,8 @@ while [ "$1" != "" ]; do
   shift
 done
 echo ----------current-----------
-pwd
+# strip trailing / from pwd result
+d=`pwd`/dummy; dirname $d
 echo ----------env-----------
 echo A=$A
 echo B=$B