Bring this up to best practices.

[nmh] / test / common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index d0a4586c2407f3226940365a7a6ab0a6b2dba20c..390f94f98f8d4753a2c3d7cfe2fcfb28d05b576b 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -13,9 +13,8 @@ test -z "$auxexecdir"  &&  auxexecdir="@libdir@"
 test -z "$bindir"  &&  bindir="@bindir@"
 test -z "$mandir"  &&  mandir="@mandir@"
 test -z "$sysconfdir"  &&  sysconfdir="@sysconfdir@"
-test -z "$pagerpath"  &&  pagerpath="@pagerpath@"
 test -z "$MULTIBYTE_ENABLED"  &&  MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@"
-export MH_TEST_DIR auxexecdir bindir mandir sysconfdir pagerpath
+export MH_TEST_DIR auxexecdir bindir mandir sysconfdir
 export MULTIBYTE_ENABLED
 
 test -z "$MH_INST_DIR"  &&  MH_INST_DIR="${MH_TEST_DIR}/inst"
@@ -167,13 +166,12 @@ setup_test ()
     #### so that we use fakesmtp.
     #### And set up the maildrop in the test directory so tests don't
     #### use the user's real maildrop.
+    #### test-slocal needs to look at the original mts.conf, so save it.
+    mv -f "${MHMTSCONF}" "${MHMTSCONF}.old"
     sed -e 's/mts: *.*/mts: smtp/' \
         -e "s%mmdfldir: *.*%mmdfldir: ${MH_TEST_DIR}/Mail%" \
         -e 's%mmdflfil: *.*%mmdflfil: maildrop%' \
-        "${MHMTSCONF}" >"${MHMTSCONF}.new"
-    #### test-slocal needs to look at the original mts.conf, so save it.
-    mv -f "${MHMTSCONF}" "${MHMTSCONF}.old"
-    mv -f "${MHMTSCONF}.new" "${MHMTSCONF}"
+        "${MHMTSCONF}.old" >"${MHMTSCONF}"
   fi
 
   # clean old test data