Mercurial > hg > octave-nkf > gnulib-hg

comparison gnulib-tool @ 6595:0c67f1400c5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix portability problem to Solaris 9 sh.
author Bruno Haible <bruno@clisp.org>
date Tue, 24 Jan 2006 19:18:45 +0000
parents bc61a0c9a750
children 7f357522e428
comparison
equal deleted inserted replaced
6594:6e4a9c8fb74c 6595:0c67f1400c5b
20 # This program is meant for authors or maintainers which want to import 20 # This program is meant for authors or maintainers which want to import
21 # modules from gnulib into their packages. 21 # modules from gnulib into their packages.
22 22
23 progname=$0 23 progname=$0
24 package=gnulib 24 package=gnulib
25 cvsdatestamp='$Date: 2006-01-22 08:31:53 $' 25 cvsdatestamp='$Date: 2006-01-24 19:18:45 $'
26 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` 26 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
27 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` 27 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
28 28
29 # You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH. 29 # You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH.
30 AUTOCONFPATH= 30 AUTOCONFPATH=
1078 *) g="$f" ;; 1078 *) g="$f" ;;
1079 esac 1079 esac
1080 echo "$g""$delimiter""$f" 1080 echo "$g""$delimiter""$f"
1081 done | LC_ALL=C sort > "$tmp"/new-files 1081 done | LC_ALL=C sort > "$tmp"/new-files
1082 # First the files that are in old-files, but not in new-files: 1082 # First the files that are in old-files, but not in new-files:
1083 for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e 's,'"$delimiter"'.*,,'`; do 1083 sed_take_first_column='s,'"$delimiter"'.*,,'
1084 for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_first_column"`; do
1084 # Remove the file. Do nothing if the user already removed it. 1085 # Remove the file. Do nothing if the user already removed it.
1085 if test -f "$destdir/$g"; then 1086 if test -f "$destdir/$g"; then
1086 if $doit; then 1087 if $doit; then
1087 echo "Removing file $g (backup in ${g}~)" 1088 echo "Removing file $g (backup in ${g}~)"
1088 mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed" 1089 mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed"
1148 fi 1149 fi
1149 fi 1150 fi
1150 rm -f "$destdir/$g.tmp" 1151 rm -f "$destdir/$g.tmp"
1151 } 1152 }
1152 # Then the files that are in new-files, but not in old-files: 1153 # Then the files that are in new-files, but not in old-files:
1154 sed_take_last_column='s,^.*'"$delimiter"',,'
1153 already_present= 1155 already_present=
1154 for f in `LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files | sed -e 's,'^.*"$delimiter"',,'`; do 1156 for f in `LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_last_column"`; do
1155 case "$f" in 1157 case "$f" in
1156 build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; 1158 build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
1157 lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; 1159 lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;;
1158 m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;; 1160 m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;;
1159 tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;; 1161 tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;;
1161 esac 1163 esac
1162 func_add_or_update 1164 func_add_or_update
1163 done 1165 done
1164 # Then the files that are in new-files and in old-files: 1166 # Then the files that are in new-files and in old-files:
1165 already_present=true 1167 already_present=true
1166 for f in `LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files | sed -e 's,'^.*"$delimiter"',,'`; do 1168 for f in `LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_last_column"`; do
1167 case "$f" in 1169 case "$f" in
1168 build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; 1170 build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
1169 lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; 1171 lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;;
1170 m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;; 1172 m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;;
1171 tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;; 1173 tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;;