Changeset 24dce9d in freewrt

Timestamp:

Jul 25, 2006, 2:52:04 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

aee909e

Parents:

ecb5fbe

Message:

• remove unused variable
• fix variable name
• fix files with same starting name (e.g. Makefile vs Makefile.in)
• fix generation of patches for new files
• allow creation of patches for new empty files

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@406 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• scripts/update-patches (modified) (6 diffs)

scripts/update-patches

@@ -31 +31 @@
 shopt -s extglob
 
+do_diff()
+{
+        local f1=$2/$1
+        local f2=$3/$1
+
+        if [[ ! -e $f1 ]]; then
+                if [[ ! -s $f2 ]]; then
+                        cat <<EOF
+--- $f1 (non-existant)
++++ $f2 (empty)
+@@ -0,0 +0,0 @@
+EOF
+                        return 0
+                fi
+                touch -t 197001010000.00 "$f1"
+        fi
+        diff -adup "$f1" "$f2"
+        return $?
+}
+
 TRANSFORM='sed s/[.+]/\\\\&/g'
 
@@ -49 +69 @@
 ORGDIST=${D_BASE}/${D_SUB}.orig
 
-DIFF_FLAGS="-adu -I \"^--- $(echo $D_SUB.orig | $TRANSFORM)@@\""
-DIFF_FLAGS="$DIFF_FLAGS -I \"^\+\+\+ $(echo $D_SUB | $TRANSFORM)@@\""
+DIFF_FLAGS="-adu -I \"^--- $(echo $D_SUB.orig/ | $TRANSFORM)@@  .*\""
+DIFF_FLAGS="$DIFF_FLAGS -I \"^\+\+\+ $(echo $D_SUB/ | $TRANSFORM)@@     .*\""
 
 for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
@@ -62 +82 @@
 
                 # Patch found. Is this the one?
-                if grep "^[+-][+-][+-] $D_CMP[^/]*/$file" "$i" >/dev/null; then
+                if grep "^[+-][+-][+-] $D_CMP[^/]*/$file        " "$i" >/dev/null; then
                         # Multiple files in the diff?
                         if [ $(grep -c "^--- $D_CMP" "$i") -gt 1 -o \
@@ -76 +96 @@
                         # Multiple diffs with this file?
                         let n=0
-                        esc=
+                        pflst=
                         for j in $PATCH_LIST; do
                                 [[ ! -f $j || $j = *@(.orig|.rej|~) ]] && \
                                     continue
-                                grep "^[+-][+-][+-] $D_CMP[^/]*/$file" \
+                                grep "^[+-][+-][+-] $D_CMP[^/]*/$file   " \
                                     "$j" >/dev/null || continue
                                 let n++
-                                esc="$esc '$j'"
+                                pflst="$pflst '$j'"
                         done
                         if (( n != 1 )); then
                                 echo "Cannot process, file $file" >&2
                                 echo "is contained in multiple patches:" >&2
-                                echo "$esc" >&2
+                                echo "$pflst" >&2
                                 echo FAIL
                                 [[ -n $SUBDIST ]] && mv \
@@ -99 +119 @@
                         accounted="$accounted $i"
                         # found it, copy preamble before comparision
-                        esc="$(echo "$file" | sed -e 's#/#\\/#g')"
                         ( sed -e "/^--- /,\$d" <$i; \
-                          cd $D_BASE && diff -adup \
-                            "$D_SUB.orig/$file" "$D_SUB/$file" \
+                          cd $D_BASE && do_diff "$file" "$D_SUB.orig" "$D_SUB" \
                         ) >"$i.new"
                         # did it change ? mark it as changed
@@ -124 +142 @@
         echo "No patch-* found for $file, creating $patchname" >&2
         ( echo '$Free''WRT$'; \
-          cd $D_BASE && diff -adup "$D_SUB.orig/$file" "$D_SUB/$file" \
+          cd $D_BASE && do_diff "$file" "$D_SUB.orig" "$D_SUB" \
         ) >$patchname
         edit="$edit $patchname"