From: David Levine <levinedl@acm.org>
Date: Wed, 26 Dec 2012 20:03:20 +0000 (-0600)
Subject: Tweaked last commit to test/common.sh.in to eliminate a mv.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/a35869649c469959c9b8e49b055268ae46f2b246?hp=-c

Tweaked last commit to test/common.sh.in to eliminate a mv.
---

a35869649c469959c9b8e49b055268ae46f2b246
diff --git a/test/common.sh.in b/test/common.sh.in
index d0a4586c..f7624ca8 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -167,13 +167,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