From owner-svn-src-head@FreeBSD.ORG  Mon Sep 22 15:27:24 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 947E8109;
 Mon, 22 Sep 2014 15:27:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7EE3E982;
 Mon, 22 Sep 2014 15:27:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8MFROHA052079;
 Mon, 22 Sep 2014 15:27:24 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8MFRO6r052078;
 Mon, 22 Sep 2014 15:27:24 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201409221527.s8MFRO6r052078@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 22 Sep 2014 15:27:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r271968 - head/usr.bin/mkimg/tests
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Sep 2014 15:27:24 -0000

Author: marcel
Date: Mon Sep 22 15:27:23 2014
New Revision: 271968
URL: http://svnweb.freebsd.org/changeset/base/271968

Log:
  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.

Modified:
  head/usr.bin/mkimg/tests/mkimg.sh

Modified: head/usr.bin/mkimg/tests/mkimg.sh
==============================================================================
--- head/usr.bin/mkimg/tests/mkimg.sh	Mon Sep 22 15:22:57 2014	(r271967)
+++ head/usr.bin/mkimg/tests/mkimg.sh	Mon Sep 22 15:27:23 2014	(r271968)
@@ -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