From: David Levine <levinedl@acm.org>
Date: Mon, 26 Sep 2016 20:50:38 +0000 (-0400)
Subject: Replaced use of GNU sed extension.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/9383ac2311caa190a93fd6694c6c82390cabf044?hp=adcc6d9d4fd9128d36fab0ef0862604b90693e63

Replaced use of GNU sed extension.
---

diff --git a/test/ali/test-ali b/test/ali/test-ali
index 6cd9d053..41ddb956 100755
--- a/test/ali/test-ali
+++ b/test/ali/test-ali
@@ -38,7 +38,7 @@ Usage: ali [switches] aliases ...
 EOF
 
 #### Skip nmh intro text.
-ali -help | sed '/^$/Q' >"$actual" 2>&1
+ali -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/anno/test-anno b/test/anno/test-anno
index 6d45cacf..3f8fe5b4 100755
--- a/test/anno/test-anno
+++ b/test/anno/test-anno
@@ -40,7 +40,7 @@ Usage: anno [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
-run_prog anno -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog anno -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/dist/test-dist b/test/dist/test-dist
index fd0df96a..dc27ae86 100755
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -72,7 +72,7 @@ Usage: dist [+folder] [msg] [switches]
 EOF
 
 #### Skip nmh intro text.
-dist -help | sed '/^$/Q' >"$actual" 2>&1
+dist -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/folder/test-packf b/test/folder/test-packf
index 91c4cb51..4d4e4db1 100755
--- a/test/folder/test-packf
+++ b/test/folder/test-packf
@@ -32,7 +32,7 @@ Usage: packf [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
-packf -help | sed '/^$/Q' >"$actual" 2>&1
+packf -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/folder/test-sortm b/test/folder/test-sortm
index 331eae7d..e6c73bae 100755
--- a/test/folder/test-sortm
+++ b/test/folder/test-sortm
@@ -38,7 +38,7 @@ Usage: sortm [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
-run_prog sortm -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog sortm -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/format/test-dp b/test/format/test-dp
index 2c5b9960..19e28c33 100755
--- a/test/format/test-dp
+++ b/test/format/test-dp
@@ -37,7 +37,7 @@ Usage: dp [switches] dates ...
 EOF
 
 #### Skip nmh intro text.
-run_prog "$dp" -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog "$dp" -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/format/test-fmtdump b/test/format/test-fmtdump
index 5c822db3..259e12a2 100755
--- a/test/format/test-fmtdump
+++ b/test/format/test-fmtdump
@@ -36,7 +36,7 @@ Usage: fmtdump [switches]
 EOF
 
 #### Skip nmh intro text.
-"$fmtdump" -help | sed '/^$/Q' >"$actual" 2>&1
+"$fmtdump" -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index fb9b9450..152b11c7 100755
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -71,7 +71,7 @@ Usage: mhfixmsg [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
-run_prog mhfixmsg -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog mhfixmsg -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 
diff --git a/test/mhical/test-mhical b/test/mhical/test-mhical
index af75cf87..533270ed 100755
--- a/test/mhical/test-mhical
+++ b/test/mhical/test-mhical
@@ -47,7 +47,7 @@ Usage: mhical [switches]
 EOF
 
 #### Skip nmh intro text.
-run_prog mhical -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog mhical -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 
diff --git a/test/mhmail/test-mhmail b/test/mhmail/test-mhmail
index 4d127e4e..ac7bc86d 100755
--- a/test/mhmail/test-mhmail
+++ b/test/mhmail/test-mhmail
@@ -89,7 +89,7 @@ Usage: mhmail [-t(o)] addrs ... [switches]
 EOF
 
 #### Skip nmh intro text.
-mhmail -help | sed '/^$/Q' >"$actual" 2>&1
+mhmail -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 
diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index b29cba15..a7e76bf2 100755
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -34,13 +34,7 @@ Usage: mhparam [profile-components] [switches]
 EOF
 
 #### Skip nmh intro text.
-# ???? debug
-set +e
-mhparam -help
-echo now through sed:
-mhparam -help | sed '/^$/Q'
-# ???? debug
-mhparam -help | sed '/^$/Q' >"$actual" 2>&1
+mhparam -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/mhpath/test-mhpath b/test/mhpath/test-mhpath
index cf2ab5d7..d07e4148 100755
--- a/test/mhpath/test-mhpath
+++ b/test/mhpath/test-mhpath
@@ -29,7 +29,7 @@ Usage: mhpath [+folder] [msgs] [switches]
 EOF
 
 #### Skip nmh intro text.
-run_prog mhpath -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog mhpath -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/mkstemp/test-mkstemp b/test/mkstemp/test-mkstemp
index 94ce0567..fcc8cd57 100755
--- a/test/mkstemp/test-mkstemp
+++ b/test/mkstemp/test-mkstemp
@@ -48,7 +48,7 @@ else
 fi
 
 #### Skip nmh intro text.
-run_prog $mkstemp -h | sed '/^$/Q' >"$actual" 2>&1
+run_prog $mkstemp -h | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 
diff --git a/test/post/test-sendfiles b/test/post/test-sendfiles
index 64ccd5e0..4e2eb612 100755
--- a/test/post/test-sendfiles
+++ b/test/post/test-sendfiles
@@ -90,7 +90,7 @@ Usage: sendfiles [switches] -to recipient -subject subject file1 [file2 ...]
 EOF
 
 #### Skip nmh intro text.
-run_prog sendfiles -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog sendfiles -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/prompter/test-prompter b/test/prompter/test-prompter
index 704f9986..1950903c 100755
--- a/test/prompter/test-prompter
+++ b/test/prompter/test-prompter
@@ -36,7 +36,7 @@ Usage: prompter [switches] file
 EOF
 
 #### Skip nmh intro text.
-run_prog prompter -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog prompter -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist
index 720b1bfe..21d5904e 100755
--- a/test/rcv/test-rcvdist
+++ b/test/rcv/test-rcvdist
@@ -33,7 +33,7 @@ Usage: rcvdist [switches] [switches for postproc] address ...
 EOF
 
 #### Skip nmh intro text.
-run_prog "$rcvdist" -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog "$rcvdist" -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/rcv/test-rcvpack b/test/rcv/test-rcvpack
index 15272af7..b39ceaf0 100755
--- a/test/rcv/test-rcvpack
+++ b/test/rcv/test-rcvpack
@@ -34,7 +34,7 @@ Usage: rcvpack [switches] file
 EOF
 
 #### Skip nmh intro text.
-run_prog "$rcvpack" -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog "$rcvpack" -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/rcv/test-rcvstore b/test/rcv/test-rcvstore
index 0f0ab0fe..a49a3ccd 100755
--- a/test/rcv/test-rcvstore
+++ b/test/rcv/test-rcvstore
@@ -39,7 +39,7 @@ Usage: rcvstore [+folder] [switches]
 EOF
 
 #### Skip nmh intro text.
-run_prog "$rcvstore" -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog "$rcvstore" -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/rcv/test-rcvtty b/test/rcv/test-rcvtty
index 800d0fba..4f1d4988 100755
--- a/test/rcv/test-rcvtty
+++ b/test/rcv/test-rcvtty
@@ -38,7 +38,7 @@ Usage: rcvtty [command ...]
 EOF
 
 #### Skip nmh intro text.
-run_prog "$rcvtty" -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog "$rcvtty" -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/repl/test-repl b/test/repl/test-repl
index 6beea72a..3e014f6c 100755
--- a/test/repl/test-repl
+++ b/test/repl/test-repl
@@ -56,7 +56,7 @@ Usage: repl: [+folder] [msg] [switches]
 EOF
 
 #### Skip nmh intro text.
-run_prog repl -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog repl -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
diff --git a/test/slocal/test-slocal b/test/slocal/test-slocal
index 800a16f9..394e1559 100755
--- a/test/slocal/test-slocal
+++ b/test/slocal/test-slocal
@@ -43,7 +43,7 @@ Usage: slocal [switches]
 EOF
 
 #### Skip nmh intro text.
-run_prog $slocal -help | sed '/^$/Q' >"$actual" 2>&1
+run_prog $slocal -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version