[pLog-svn] r6097 - plog/branches/lifetype-1.2/bin-devel

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2007-11-29 14:23:22 -0500 (Thu, 29 Nov 2007)
New Revision: 6097

Modified:
   plog/branches/lifetype-1.2/bin-devel/build-diff.sh
Log:
a couple small fixes to make the upgrade build script work a little better.  One major fix that was reported http://bugs.lifetype.net/view.php?id=1416  Can anyone spot the fatal flaw in the old script?  I couldn't.  It is the quote mark in the echo/comment command caused a bunch of lines to be echoed rather than executed...

Modified: plog/branches/lifetype-1.2/bin-devel/build-diff.sh
===================================================================
--- plog/branches/lifetype-1.2/bin-devel/build-diff.sh	2007-11-29 17:56:34 UTC (rev 6096)
+++ plog/branches/lifetype-1.2/bin-devel/build-diff.sh	2007-11-29 19:23:22 UTC (rev 6097)
@@ -36,7 +36,9 @@
 # create our temporary folder
 WORKFOLDER=`date +%Y%m%d%H%M`
 DESTFOLDER="destination"
+rm -rf $WORKFOLDER
 mkdir $WORKFOLDER
+rm -rf $DESTFOLDER
 mkdir $DESTFOLDER
 
 # checkout the first branch
@@ -64,7 +66,7 @@
 # this list in order because the same file could have been added
 # and deleted within the time range we are interested in, and
 # the current method will cause errors.
-for i in `cat $WORKFOLDER/files|grep [^UA]|grep -v revision|awk '{print $2}'`
+for i in `grep "^[UA]" $WORKFOLDER/files | grep -v revision | awk '{print $2}'`
 do
 	echo Keeping: $i
 	FOLDER=`dirname $i`
@@ -72,9 +74,6 @@
 	cp $WORKFOLDER/$i $DESTFOLDER/$FOLDER
 done
 
-echo Error about wizard not existing is okay if it wasn't changed
-mv $DESTFOLDER/wizard $DESTFOLDER/wizard.php
-
 # finally, update the version.php file
 echo "Updating the version.php file..."
 VERNAME=`basename ${BRANCH2}`
@@ -91,17 +90,17 @@
 rm -rf $WORKFOLDER
 
 # remove files that shouldn't be included in upgrades
-rm $DESTFOLDER/wizard.php
+rm $DESTFOLDER/wizard*
 rm -r $DESTFOLDER/config/
 
 # remove files that shouldn't be included in any release
-rm -r $DESTFOLDER/bin-devel/
-rm -r $DESTFOLDER/docs-devel/
-rm -r $DESTFOLDER/plog.xcode/
-rm -r $DESTFOLDER/release/
-rm -r $DESTFOLDER/templates/LifeType
-rm -r $DESTFOLDER/templates/grey-sf
-rm -r $DESTFOLDER/templates/plogworld
+rm -rf $DESTFOLDER/bin-devel/
+rm -rf $DESTFOLDER/docs-devel/
+rm -rf $DESTFOLDER/plog.xcode/
+rm -rf $DESTFOLDER/release/
+rm -rf $DESTFOLDER/templates/LifeType
+rm -rf $DESTFOLDER/templates/grey-sf
+rm -rf $DESTFOLDER/templates/plogworld
 
 
 echo "Done! Output available under the $DESTFOLDER/ folder"