Changeset daec02d in freewrt

Timestamp:

Jul 25, 2006, 12:17:04 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

f3b127c

Parents:

9829980

Message:

freewrtify a little

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

File:

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

scripts/update-patches

@@ -1 @@
-#!/bin/mksh
+#!/usr/bin/env bash
 # $FreeWRT$
 # $MirOS: ports/infrastructure/scripts/update-patches,v 1.5 2006/06/15 19:18:43 tg Exp $
@@ -26 +26 @@
 # the possibility of such damage or existence of a nontrivial bug.
 
+shopt -s extglob
 
-# if OS diff not capable enough, require GNU diff
-if [[ $NEED_GDIFF = yes ]]; then
-        if [[ ! -x $(which gdiff) ]]; then
-                exec >&2
-                print "Fatal:\tGNU diff (gdiff) required for 'update-patches'"
-                print "\tIt may be installed from the textproc/gdiff port."
-                exit 1
-        fi
-        DIFFPROG=$(which gdiff)
-        TRANSFORM=cat
-        DIFF_FLAGS="-adu --ignore-matching-lines="
-        DIFF_FLAGS="${DIFF_FLAGS}\"^--- @@$PATCHORIG    .*\""
-        DIFF_FLAGS="${DIFF_FLAGS} --ignore-matching-lines="
-        DIFF_FLAGS="${DIFF_FLAGS}\"^+++ @@      .*\""
-else
-        DIFFPROG=$(which diff)
-        TRANSFORM='sed s/[.+]/\\\\&/g'
-        tfile=$(print -r -- $PATCHORIG | $TRANSFORM)
-        DIFF_FLAGS="-adu -I \"^--- @@$(print -- $tfile) \""
-        DIFF_FLAGS="${DIFF_FLAGS} -I \"^\+\+\+ @@       \""
-fi
+TRANSFORM='sed s/[.+]/\\\\&/g'
+tfile=$(echo "$PATCHORIG" | $TRANSFORM)
+DIFF_FLAGS="-adu -I \"^--- @@$(echo "$tfile")   \""
+DIFF_FLAGS="${DIFF_FLAGS} -I \"^\+\+\+ @@       \""
 
 mkdir -p $PATCHDIR
@@ -59 +43 @@
 while read -p file; do
         if cmp -s "$WRKDIST/$file" "$WRKDIST/$file$PATCHORIG"; then
-                print -r -- "$file and $file$PATCHORIG are identical" >&2
+                echo "$file and $file$PATCHORIG are identical" >&2
                 continue
         fi
         if [[ ! -f $WRKDIST/$file ]]; then
-                print -r -- "$file does not exist" >&2
+                echo "$file does not exist" >&2
                 continue
         fi
-        print -r -- "Processing ${file}..." >&2
+        echo "Processing ${file}..." >&2
         # look in patchdir for an existing patchfile matching this
         cd $PATCHDIR
@@ -78 +62 @@
                         accounted="$accounted $i"
                         # found it, copy preamble before comparision
-                        esc="$(print -r -- "$file" | sed -e 's#/#\\/#g')"
+                        esc="$(echo "$file" | sed -e 's#/#\\/#g')"
                         ( sed -e "/^--- $esc$PATCHORIG/,\$d" <$i; \
-                          cd $WRKDIST && ${DIFFPROG} -adup \
+                          cd $WRKDIST && diff -adup \
                           ${DIFF_ARGS} "$file$PATCHORIG" "$file" \
                         ) >"$i.new"
                         # did it change ? mark it as changed
-                        tfile="$(print -r -- "$file" | $TRANSFORM)"
-                        if eval ${DIFFPROG} "$(print -r -- "${DIFF_FLAGS}" \
+                        tfile="$(echo "$file" | $TRANSFORM)"
+                        if eval diff "$(echo "${DIFF_FLAGS}" \
                             ${DIFF_ARGS} | sed "s#@@#${tfile}#g")" \
                             "$i" "$i.new" 1>&2; then
                                 rm "$i.new"
                         else
-                                print -r -- "Patch $i for $file updated" >&2
+                                echo "Patch $i for $file updated" >&2
                                 mv "$i" "$i$PATCHORIG"
                                 mv "$i.new" "$i"
@@ -100 +84 @@
 
         # Build a sensible name for the new patch file
-        patchname=patch-$(print -r -- "$file" | sed -e 's#[/. ]#_#g')
-        print -r -- "No patch-* found for $file, creating $patchname" >&2
-        ( print -r -- '$Mir''OS$'; \
-          cd $WRKDIST && ${DIFFPROG} -adup ${DIFF_ARGS} \
-          "$file$PATCHORIG" "$file" \
+        patchname=patch-$(echo "$file" | sed -e 's#[/. ]#_#g')
+        echo "No patch-* found for $file, creating $patchname" >&2
+        ( echo '$Free''WRT$'; \
+          cd $WRKDIST && diff -adup ${DIFF_ARGS} "$file$PATCHORIG" "$file" \
         ) >$patchname
         edit="$edit $patchname"
@@ -116 +99 @@
             && continue
         grep '^\\ No newline at end of file' $i >/dev/null \
-            && print -r -- "*** Patch $i needs manual intervention" >&2
+            && echo "*** Patch $i needs manual intervention" >&2
         [[ $accounted != *@($i)* ]] \
-            && print -r -- "*** Patch $i not accounted for" >&2
+            && echo "*** Patch $i not accounted for" >&2
 done
 
-print -r -- $edit
+echo $edit
 exit 0