[QGIS Commit] r15229 - trunk/qgis/scripts

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-20 14:48:13 -0800 (Sun, 20 Feb 2011)
New Revision: 15229

Modified:
   trunk/qgis/scripts/update-indent.sh
Log:
update update-indent.sh

Modified: trunk/qgis/scripts/update-indent.sh
===================================================================
--- trunk/qgis/scripts/update-indent.sh	2011-02-20 22:46:20 UTC (rev 15228)
+++ trunk/qgis/scripts/update-indent.sh	2011-02-20 22:48:13 UTC (rev 15229)
@@ -19,13 +19,14 @@
 if [ -f .lastcommit ]; then
 	REV0=$(<.lastcommit)
 	svn revert -R .
+	find . -name "*.prepare" -delete
 	svn update -r$REV0
 else
 	REV0=$(svn info | sed -ne "s/Revision: //p")
 fi
 
 # update
-MODIFIED=$(svn update | sed -ne "s/^[^ ]* *//p")
+MODIFIED=$(svn update | sed -ne "s/^[^ ]. *//p")
 REV1=$(svn info | sed -ne "s/Revision: //p")
 
 if [ "$REV0" -eq "$REV1" ]; then
@@ -41,7 +42,7 @@
 # reformat
 for f in $MODIFIED; do
 	case "$f" in
-	src/core/spatialite/*)
+	src/core/spatialite/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*|src/providers/sqlanywhere/sqlanyconnection/*)
 		echo $f skipped
 		continue
 		;;
@@ -85,6 +86,7 @@
 
 	# just echo for now
 	echo "svn commit -m \"automatic indentation update (r$REV0-r$REV1)\""
+	[ -f .lastcommit ] && mv .lastcommit .prevcommit
 	echo $REV1 >.lastcommit
 else
 	echo "No indentation updates."