changeset 17475:9862f48da57d

bootstrap: port to OpenBSD sed * build-aux/bootstrap (insert_if_absent): Port to OpenBSD sed which does not interpret `-' as a file argument to mean stdin. Signed-off-by: Eric Blake <eblake@redhat.com>
author Mike Miller <mtmiller@ieee.org>
date Mon, 12 Aug 2013 23:39:29 -0400
parents 88b6cb053cd7
children 6057744acd2c
files ChangeLog build-aux/bootstrap
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-12  Mike Miller  <mtmiller@ieee.org>  (tiny change)
+
+	bootstrap: port to OpenBSD sed
+	* build-aux/bootstrap (insert_if_absent): Port to OpenBSD sed which
+	does not interpret `-' as a file argument to mean stdin.
+
 2013-08-15  Eric Blake  <eblake@redhat.com>
 
 	warnings: minor optimization
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2013-08-09.15; # UTC
+scriptversion=2013-08-15.22; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -320,7 +320,7 @@
     die "Error: Duplicate entries in $file: " $duplicate_entries
   fi
   linesold=$(gitignore_entries $file | wc -l)
-  linesnew=$(echo "$str" | gitignore_entries - $file | sort -u | wc -l)
+  linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l)
   if [ $linesold != $linesnew ] ; then
     { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
       || die "insert_if_absent $file $str: failed"