X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d8c7d4f2c785d35cebd5ea64213a335561a57f7d..0f0af4e32a4d734209c16282b63f7cb1094e2699:/test/mhbuild/test-utf8-body

diff --git a/test/mhbuild/test-utf8-body b/test/mhbuild/test-utf8-body
index 42ea3e0f..47229de6 100755
--- a/test/mhbuild/test-utf8-body
+++ b/test/mhbuild/test-utf8-body
@@ -21,7 +21,7 @@ testname="${MH_TEST_DIR}/$$"
 #### Rely on sendmail/pipe below to override default mts.
 mts_fakesendmail="${MHMTSCONF}-fakesendmail"
 cp "${MHMTSCONF}" "$mts_fakesendmail"
-printf "%s\n" "sendmail: ${srcdir}/test/fakesendmail" >>"$mts_fakesendmail"
+printf 'sendmail: %s/test/fakesendmail\n' "$srcdir" >>"$mts_fakesendmail"
 MHMTSCONF="$mts_fakesendmail"
 
 # argument: expected output
@@ -34,16 +34,13 @@ test_attachment ()
   inc -silent -file "$mbox"
   rm -f "$mbox" "$mbox.map"
 
-  cur=`mhpath cur`
-
   #
   # It's hard to calculate the exact Date: header post is going to
   # use, so we'll just use sed to remove the actual date so we can easily
   # compare it against our "correct" output.  And same for charset.
   #
-  sed -e 's/^Date:.*/Date:/' \
-      -e 's/; charset=".*//' \
-      "$cur" > "${testname}.actual"
+  sed -e 's/^Date:.*/Date:/' -e 's/; charset=".*//' \
+      "`mhpath cur`" > "${testname}.actual"
 
   check "${testname}.actual" "$1"
 }
@@ -55,7 +52,7 @@ EOF
 
 cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
 From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
 Subject: Test
 Nmh-Attachment: $MH_TEST_DIR/attachment.txt
 
@@ -64,7 +61,7 @@ EOF
 
 cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
@@ -87,12 +84,12 @@ EOF
 
 test_attachment "${testname}.expected"
 
-# check that 8-bit body is still encoded as quoted-printable
-# text/plain, even with an attachment
+# check that 8-bit body is encoded as quoted-printable text/plain,
+# even with an attachment
 
 cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
 From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
 Subject: Test
 Nmh-Attachment: $MH_TEST_DIR/attachment.txt
 
@@ -101,7 +98,7 @@ EOF
 
 cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"