1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
|
#! /bin/sh -e
# DP: Fix bashisms in Tools/faqwiz/move-faqwiz.sh
dir=
if [ $# -eq 3 -a "$2" = '-d' ]; then
pdir="-d $3"
dir="$3/"
elif [ $# -ne 1 ]; then
echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
exit 1
fi
case "$1" in
-patch)
patch $pdir -f --no-backup-if-mismatch -p0 < $0
;;
-unpatch)
patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
;;
*)
echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
exit 1
esac
exit 0
Index: Tools/faqwiz/move-faqwiz.sh
===================================================================
--- Tools/faqwiz/move-faqwiz.sh (Revision 64887)
+++ Tools/faqwiz/move-faqwiz.sh (Arbeitskopie)
@@ -9,7 +9,7 @@
# blackjesus:~> ./move-faqwiz.sh 2\.1 3\.2
# Moving FAQ question 02.001 to 03.002
-if [ x$2 == x ]; then
+if [ x$2 = x ]; then
echo "Need 2 args: original_version final_version."
exit 2
fi
@@ -19,7 +19,7 @@
exit 2
fi
-function cut_n_pad() {
+cut_n_pad() {
t=`echo $1 | cut -d. -f $2`
export $3=`echo $t | awk "{ tmp = \\$0; l = length(tmp); for (i = 0; i < $2-l+1; i++) { tmp = "0".tmp } print tmp }"`
}
@@ -28,7 +28,13 @@
cut_n_pad $1 2 suffix1
cut_n_pad $2 1 prefix2
cut_n_pad $2 2 suffix2
-tmpfile=tmp$RANDOM.tmp
+if which tempfile >/dev/null; then
+ tmpfile=$(tempfile -d .)
+elif [ -n "$RANDOM" ]; then
+ tmpfile=tmp$RANDOM.tmp
+else
+ tmpfile=tmp$$.tmp
+fi
file1=faq$prefix1.$suffix1.htp
file2=faq$prefix2.$suffix2.htp
|