summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2014-09-22 15:27:23 +0000
committermarcel <marcel@FreeBSD.org>2014-09-22 15:27:23 +0000
commit9abf6bc2c96f56f61d52d221b5c8823acdd41767 (patch)
treeb8d3cfc4f75dea85fa5e38aaefcaa06abd2d75fc
parente21e58067d1bfdf6154a75d4b9c74a9a39b16aef (diff)
downloadFreeBSD-src-9abf6bc2c96f56f61d52d221b5c8823acdd41767.zip
FreeBSD-src-9abf6bc2c96f56f61d52d221b5c8823acdd41767.tar.gz
Don't echo '# $FreeBSD$' as the first line into the .uu file. Keyword
substitution applies to this file, including the echo command. Avoid the match (and substitution) by breaking the string up into 3 parts.
-rwxr-xr-xusr.bin/mkimg/tests/mkimg.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/mkimg/tests/mkimg.sh b/usr.bin/mkimg/tests/mkimg.sh
index 5482ad6..00b5d92 100755
--- a/usr.bin/mkimg/tests/mkimg.sh
+++ b/usr.bin/mkimg/tests/mkimg.sh
@@ -91,7 +91,8 @@ mkimg_test()
hexdump -C $image > $result
baseline=`atf_get_srcdir`/$image
if test "x$mkimg_update_baseline" = "xyes"; then
- echo '# $FreeBSD$' > $image.gz.uu
+ # Prevent keyword expansion when writing the keyword.
+ (echo -n '# $'; echo -n FreeBSD; echo '$') > $image.gz.uu
gzip -c $result | uuencode $image.gz >> $image.gz.uu
rm $image $result _tmp-*
else
OpenPOWER on IntegriCloud