From c597eff825d1f4d795f877c69da7105437cedab6 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 24 Jan 2006 19:18:45 +0000 Subject: [PATCH] Fix portability problem to Solaris 9 sh. --- ChangeLog | 6 ++++++ gnulib-tool | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e32a3375b..06f95211af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-24 Bruno Haible + + * gnulib-tool (func_import): Avoid constructing complicated sed + expressions inside backquote. + Report and solution by Mark D. Baushke . + 2006-01-24 Jim Meyering * modules/openat (Files): Add lib/intprops.h. diff --git a/gnulib-tool b/gnulib-tool index 6b4d6e5670..5aa7694dbf 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-01-22 08:31:53 $' +cvsdatestamp='$Date: 2006-01-24 19:18:45 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -1080,7 +1080,8 @@ func_import () echo "$g""$delimiter""$f" done | LC_ALL=C sort > "$tmp"/new-files # First the files that are in old-files, but not in new-files: - for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e 's,'"$delimiter"'.*,,'`; do + sed_take_first_column='s,'"$delimiter"'.*,,' + for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_first_column"`; do # Remove the file. Do nothing if the user already removed it. if test -f "$destdir/$g"; then if $doit; then @@ -1150,8 +1151,9 @@ func_import () rm -f "$destdir/$g.tmp" } # Then the files that are in new-files, but not in old-files: + sed_take_last_column='s,^.*'"$delimiter"',,' already_present= - for f in `LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files | sed -e 's,'^.*"$delimiter"',,'`; do + for f in `LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_last_column"`; do case "$f" in build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; @@ -1163,7 +1165,7 @@ func_import () done # Then the files that are in new-files and in old-files: already_present=true - for f in `LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files | sed -e 's,'^.*"$delimiter"',,'`; do + for f in `LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_last_column"`; do case "$f" in build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; -- 2.30.2