Author: toad
Date: 2007-05-10 12:04:38 +0000 (Thu, 10 May 2007)
New Revision: 13197
Modified:
trunk/scripts/verify-whitespace-patch.sh
Log:
More fixes - can deal with patches impacting plugins as well, and separate
scripts for renaming vs content
Modified: trunk/scripts/verify-whitespace-patch.sh
===================================================================
--- trunk/scripts/verify-whitespace-patch.sh 2007-05-10 11:27:01 UTC (rev
13196)
+++ trunk/scripts/verify-whitespace-patch.sh 2007-05-10 12:04:38 UTC (rev
13197)
@@ -9,6 +9,8 @@
echo Filename: "$FILENAME"
echo -n "Please enter sed script?"
read SEDSCRIPT
+echo -n "Please enter rename script?"
+read RENAMESCRIPT
# Make a temporary directory
TEMPDIR=`mktemp -d ~/verify-patch-temp-XXXXXXXXXX`
echo Temporary directory: $TEMPDIR
@@ -21,21 +23,31 @@
cd $OLDDIR
DNAME=`ls`
echo DNAME = "$DNAME"
-mv */* */.[a-z0-9]* .
-rm -R "$DNAME"
+cd "${OLDDIR}/${DNAME}"
+ant distclean
svn revert -R .
svn update -r $OLDREVISION
+cd "$OLDDIR"
+mv "$DNAME" freenet
+cd freenet
+mv src/plugins ..
+cd ../plugins
ant distclean
+svn revert -R .
+svn update -r $OLDREVISION
+cd ..
find -iname .svn | xargs rm -R
rm -R .[a-z0-9]*
cp -a $OLDDIR/* $NEWDIR
if [[ -n $SEDSCRIPT ]]; then
cd $OLDDIR
find . -type f -iname "*.java" | (while read x; do cat "$x" | sed
"$SEDSCRIPT" > "$x.1"; mv "$x.1" "$x"; done)
- find `pwd` -type d | (while read x; do cd "$x"; rename "$SEDSCRIPT" *;
done)
fi
-cd $NEWDIR
-if ! patch -p2 < $FILENAME ; then exit Failed to apply patch ; else echo
Applied patch successfully. ; fi
+if [[ -n $RENAMESCRIPT ]]; then
+ find "$OLDDIR" -type d | (while read x; do cd "$x"; rename "$SEDSCRIPT"
*; done)
+fi
+cd "$NEWDIR"
+if ! patch -p1 < $FILENAME ; then exit Failed to apply patch ; else echo
Applied patch successfully. ; fi
diff -Nurw "$OLDDIR" "$NEWDIR" > $TEMPDIR/diff-uw
if [ -s $TEMPDIR/diff-uw ] ; then less $TEMPDIR/diff-uw ; else echo No
differences found after compensating for whitespace; fi
rm -R $TEMPDIR
