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

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2008-01-23 10:37:04 -0500 (Wed, 23 Jan 2008)
New Revision: 6166

Modified:
   plog/branches/lifetype-1.2/bin-devel/build-diff.sh
Log:
make the upgrade build script work a little better, and output less false errors

Modified: plog/branches/lifetype-1.2/bin-devel/build-diff.sh
===================================================================
--- plog/branches/lifetype-1.2/bin-devel/build-diff.sh	2008-01-23 14:51:33 UTC (rev 6165)
+++ plog/branches/lifetype-1.2/bin-devel/build-diff.sh	2008-01-23 15:37:04 UTC (rev 6166)
@@ -11,11 +11,11 @@
 	echo " "
 	echo "Usage: $0 branch1 branch2"
         echo " "
-	echo "Where branch1 and branch2 are two different branches/folders from the repository"
+	echo "Where branch1 and branch2 are two different branches/tags from the repository"
 	echo " "
 	echo "Example:"
 	echo " "
-	echo "    $0 tags/plog-1.0.1 branches/plog-1.0.2"
+	echo "    $0 tags/lifetype-1.2.5 tags/lifetype-1.2.6"
 	exit -1
 fi
 
@@ -45,19 +45,23 @@
 echo "Checking out $BRANCH1..."
 svn checkout $SVNSERVER$SVNREPO/$BRANCH1 $WORKFOLDER > /dev/null
 # switch to the second one
-cd $WORKFOLDER
+pushd $WORKFOLDER > /dev/null
 echo "Switching to $BRANCH2..."
 REV=`svn switch $SVNSERVER$SVNREPO/$BRANCH2 | tee files | tail -n 1 | cut -d ' ' -f 4 | tr -d . `
-cd ..
+popd > /dev/null
 
 # and remove all unnecessary files
 echo "Removing unnecessary files...";
 for i in $TOREMOVE
 do
-  echo "  -- removing $i"
+#  echo "  -- removing $i"
   rm -rf $WORKFOLDER/$i
 done
 
+# remove files that shouldn't be included in upgrades
+rm -f $WORKFOLDER/wizard*
+rm -rf $WORKFOLDER/config/
+
 echo "Generating MD5 hash of files..."
 php $WORKFOLDER/bin-devel/genmd5.php
 
@@ -68,10 +72,14 @@
 # the current method will cause errors.
 for i in `grep "^[UA]" $WORKFOLDER/files | grep -v revision | awk '{print $2}'`
 do
-	echo Keeping: $i
-	FOLDER=`dirname $i`
-	mkdir -p $DESTFOLDER/$FOLDER
-	cp $WORKFOLDER/$i $DESTFOLDER/$FOLDER
+    if [ -f $WORKFOLDER/$i -o -d $WORKFOLDER/$i ]; then
+      echo Keeping: $i
+	  FOLDER=`dirname $i`
+	  mkdir -p $DESTFOLDER/$FOLDER
+	  cp $WORKFOLDER/$i $DESTFOLDER/$FOLDER
+#    else
+#      echo Ignoring: $i
+    fi
 done
 
 # finally, update the version.php file
@@ -89,10 +97,6 @@
 # remove temporary folders
 rm -rf $WORKFOLDER
 
-# remove files that shouldn't be included in upgrades
-rm $DESTFOLDER/wizard*
-rm -r $DESTFOLDER/config/
-
 # remove files that shouldn't be included in any release
 rm -rf $DESTFOLDER/bin-devel/
 rm -rf $DESTFOLDER/docs-devel/