From b8538846d82f2bd7827eb66a7dc156f4f07b1a71 Mon Sep 17 00:00:00 2001
From: David Levine <levinedl@acm.org>
Date: Fri, 7 Oct 2016 22:21:02 -0400
Subject: [PATCH] Replace `id -u` with $$ so that tests have a chance of
 working on old Solaris hosts.

---
 docs/contrib/build_nmh        | 6 ++++--
 test/inc/test-pop             | 2 +-
 test/oauth/common.sh          | 6 +++---
 test/post/test-post-common.sh | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index 25a02642..a2372d21 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -85,7 +85,9 @@ if [ $# -gt 0 ]; then
 fi
 
 #### Check to see that we're in a nmh source directory.
-if ! grep 'the authors of nmh' COPYRIGHT >/dev/null; then
+if grep 'the authors of nmh' COPYRIGHT >/dev/null; then
+  :
+else
   echo "$0: not in nmh source directory"
   exit 1
 fi
@@ -241,7 +243,7 @@ config_opts="--prefix=$config_prefix"
 
 #### dotlocking, the usual default, requires chgrp and chmod of inc.
 installpriv=
-if [ $install -ge 1  -a  `id -u` -ne 0 ]; then
+if [ $install -ge 1  -a  "$LOGNAME" != root ]; then
   if [ "$config_locking" = dot ]; then
     echo "$0: "'install requires chgrp and chmod 2755'
     echo 'so will sudo to install.  Terminate with Ctrl-C if unacceptable.'
diff --git a/test/inc/test-pop b/test/inc/test-pop
index 4f92644b..0ae80293 100755
--- a/test/inc/test-pop
+++ b/test/inc/test-pop
@@ -24,7 +24,7 @@ setup_test
 
 TESTUSER=testuser
 TESTPASS=testuserpass
-arith_eval 64001 + `id -u` % 1000
+arith_eval 64001 + $$ % 1000
 testport=$arith_val
 
 HOME="${MH_TEST_DIR}"; export HOME
diff --git a/test/oauth/common.sh b/test/oauth/common.sh
index d2ac2a27..342e5786 100644
--- a/test/oauth/common.sh
+++ b/test/oauth/common.sh
@@ -10,13 +10,13 @@ fi
 
 testname="${MH_TEST_DIR}/$$"
 
-arith_eval 64001 + `id -u` % 1000
+arith_eval 64001 + $$ % 1000
 http_port=${arith_val}
 
-arith_eval 64000 + `id -u` % 1000
+arith_eval ${http_port} + 1
 pop_port=${arith_val}
 
-arith_eval 64002 + `id -u` % 1000
+arith_eval ${pop_port} + 1
 smtp_port=${arith_val}
 
 cat >> ${MH} <<EOF
diff --git a/test/post/test-post-common.sh b/test/post/test-post-common.sh
index bfbe08db..66feddca 100755
--- a/test/post/test-post-common.sh
+++ b/test/post/test-post-common.sh
@@ -9,7 +9,7 @@ set -e
 
 setup_test
 
-arith_eval 64000 + `id -u` % 1000
+arith_eval 64000 + $$ % 1000
 localport=$arith_val
 testname="${MH_TEST_DIR}/$$"
 
-- 
2.56.0