aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Bachmeyer <jcb62281@gmail.com>2018-12-29 18:01:58 +1100
committerBen Elliston <bje@gnu.org>2018-12-29 18:01:58 +1100
commit6c7789fa9f57bcf6a7fd516b45748f972a27bade (patch)
tree052b4ec97e419e9995830f003cbe0f01b38081ea
parent6ccb10558e84eca592742a415f64bb6719565875 (diff)
downloaddejagnu-6c7789fa9f57bcf6a7fd516b45748f972a27bade.zip
dejagnu-6c7789fa9f57bcf6a7fd516b45748f972a27bade.tar.gz
dejagnu-6c7789fa9f57bcf6a7fd516b45748f972a27bade.tar.bz2
* dejagnu: Avoid use of semicolon as sed(1) command separator.
POSIX does not clearly require sed(1) to support that feature. Signed-off-by: Ben Elliston <bje@gnu.org>
-rw-r--r--ChangeLog5
-rwxr-xr-xdejagnu2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e1f049..cefd9f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-29 Jacob Bachmeyer <jcb62281@gmail.com>
+
+ * dejagnu: Avoid use of semicolon as sed(1) command separator.
+ POSIX does not clearly require sed(1) to support that feature.
+
2018-12-28 Jacob Bachmeyer <jcb62281@gmail.com>
* testsuite/lib/util-defs.exp: Whitespace clean up.
diff --git a/dejagnu b/dejagnu
index 6cd52f6..7e75940 100755
--- a/dejagnu
+++ b/dejagnu
@@ -402,7 +402,7 @@ if $want_help ; then
exit 2
fi
help_prefix_pat=$(grep '#help' "$help_file" \
- | sed 's/#help.*$//;1q' | tr '[:print:][:blank:]' .)
+ | sed -e 's/#help.*$//' -e '1q' | tr '[:print:][:blank:]' .)
if expr "$verbose" \> 1 > /dev/null ; then
echo Extracting help from "'$help_file'" with prefix "'$help_prefix_pat'"
fi