X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4f9a626afed661270364f0f7982fc3767f688e05..b96cc2bb14029099f59cfa9d77318f8c5f54db57:/test/format/test-localmbox

diff --git a/test/format/test-localmbox b/test/format/test-localmbox
index a0d4392b..32a38565 100755
--- a/test/format/test-localmbox
+++ b/test/format/test-localmbox
@@ -5,8 +5,8 @@
 #
 
 if test -z "${MH_OBJ_DIR}"; then
-    srcdir=`dirname $0`/../..
-    MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR
+    srcdir=`dirname "$0"`/../..
+    MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
 fi
 
 . "$MH_OBJ_DIR/test/common.sh"
@@ -15,11 +15,15 @@ setup_test
 
 testname="Some User <some@domain.com>"
 
+#### Remove existing Local-Mailbox: profile component, if any.  Then
+#### add one.
+grep -v 'Local-Mailbox: ' ${MH} > ${MH}.new
+mv -f ${MH}.new ${MH}
 echo "Local-Mailbox: ${testname}" >> ${MH}
 
 # We can use "ap" to get the output of format commands
 
-testoutput=$(${MH_LIB_DIR}/ap -format "%(localmbox)" ignore)
+testoutput=`run_prog ${MH_LIBEXEC_DIR}/ap -format "%(localmbox)" ignore`
 
 if [ x"${testname}" != x"${testoutput}" ]; then
 	echo "Expected ${testname}, got ${testoutput}"