X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8fcc5d7f43931e3ec9053b20f5e050b7a4008bc9..acf6604ecf011d75c6fd99e4b94f90e40a6cb083:/test/format/test-mymbox

diff --git a/test/format/test-mymbox b/test/format/test-mymbox
index c154a8b7..39ab4c11 100755
--- a/test/format/test-mymbox
+++ b/test/format/test-mymbox
@@ -13,7 +13,7 @@ fi
 
 setup_test
 
-user="`id -un`"
+user=${LOGNAME:-`id -un`}
 host=`${MH_OBJ_DIR}/test/getfqdn`
 
 run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) ${user}" \
@@ -25,6 +25,10 @@ run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) nosuchuser@nosuchhost.blah" \
 
 myname="Random User <random@user.something.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: ${myname}" >> ${MH}
 
 run_test "echo `${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${myname}"`" \