From 6ba8350847a11b3867163113ed559a222c38832d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 28 Feb 2009 03:23:18 +0100 Subject: [PATCH] Make a sed expression POSIX compliant. --- ChangeLog | 6 ++++++ gnulib-tool | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 79abe824c..f4131d6ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-02-27 Bruno Haible + * gnulib-tool (func_import): Make the sed expression used to create the + sed script for updating the .gitignore file POSIX compliant. + Reported by Eric Blake. + +2009-02-27 Bruno Haible + * gnulib-tool (sed): Don't alias as "sed --posix". Reported by Eric Blake. diff --git a/gnulib-tool b/gnulib-tool index a870a0067..4f254b4a7 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3571,7 +3571,7 @@ s,//*$,/,' echo "Updating $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)" mv -f "$destdir/$dir$ignore" "$destdir/$dir$ignore"~ { sed -e 's,/,\\/,g' -e 's,^,/^,' -e 's,$,\$/d,' < "$tmp"/ignore-removed - if test -n "$anchor"; then sed -e 's,/,\\/,g' -e "s,^,/^${doubly_escaped_anchor}," -e 's,$,\$/d,' < "$tmp"/ignore-removed; fi + if test -n "$anchor"; then sed -e 's,/,\\/,g' -e "s,^,/^${doubly_escaped_anchor}," -e 's,$,$/d,' < "$tmp"/ignore-removed; fi } > "$tmp"/sed-ignore-removed { cat "$destdir/$dir$ignore"~ sed -e "s|^|$anchor|" < "$tmp"/ignore-added -- 2.11.0