r20488 - gnucash/branches/2.4/packaging/win32 - [20487]Windows nightly build: fix webserver directory creation hack

[Geert Janssens]

Author: gjanssens
Date: 2011-03-26 06:55:34 -0400 (Sat, 26 Mar 2011)
New Revision: 20488
Trac: http://svn.gnucash.org/trac/changeset/20488

Modified:
   gnucash/branches/2.4/packaging/win32/build_package.sh
Log:
[20487]Windows nightly build: fix webserver directory creation hack

Modified: gnucash/branches/2.4/packaging/win32/build_package.sh
===================================================================
--- gnucash/branches/2.4/packaging/win32/build_package.sh	2011-03-26 10:50:18 UTC (rev 20487)
+++ gnucash/branches/2.4/packaging/win32/build_package.sh	2011-03-26 10:55:34 UTC (rev 20488)
@@ -7,10 +7,11 @@
 #
 
 set -e
+LOG_DIR=build-logs
 
 function on_error() {
   if [ `hostname` = "gnucash-win32" ]; then
-    scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/build-logs
+    scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
   fi
   exit
 }
@@ -38,11 +39,11 @@
 LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
 mkdir -p ${_OUTPUT_DIR}
 
+# Small hack to create $LOG_DIR on the webserver if it doesn't exist yet
 if [ `hostname` = "gnucash-win32" ]; then
-  # Small hack to create the build-logs directory if it doesn't exist yet
-  mkdir "$TMP_DIR/build-logs"
-  scp -r "$TMP_DIR/build-logs" upload at code.gnucash.org:public_html/win32
-  rmdir "$TMP_DIR/build-logs"
+  mkdir "$_OUTPUT_DIR/$LOG_DIR"
+  scp -r "$_OUTPUT_DIR/$LOG_DIR" upload at code.gnucash.org:public_html/win32
+  rmdir "$_OUTPUT_DIR/$LOG_DIR"
 fi
 
 set +e
@@ -91,13 +92,12 @@
 fi
 
 # If we're running on the build server then upload the files
-# Note: change this target if you're building a different branch
 if [ `hostname` = "gnucash-win32" ]; then
-  # Small hack to create the target directory if it doesn't exist yet
-  mkdir "$TMP_DIR/$TARGET_DIR"
-  scp -r "$TMP_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32
-  rmdir "$TMP_DIR/$TARGET_DIR"
+  # Small hack to create the $TARGET_DIR on the webserver if it doesn't exist yet
+  mkdir "$_OUTPUT_DIR/$TARGET_DIR"
+  scp -r "$_OUTPUT_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32
+  rmdir "$_OUTPUT_DIR/$TARGET_DIR"
   # Copy the files to the chosen target directory
-  scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/build-logs
+  scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
   scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR
 fi