From 6ffc947376ef853f17b5dee18af6896251feed99 Mon Sep 17 00:00:00 2001
From: Geert Janssens <janssens-geert@telenet.be>
Date: Thu, 24 Mar 2011 19:42:22 +0000
Subject: [PATCH] [20456] Some additional Windows nightly build fixes: -
 restore the original mingw/msys link, even when the build script abort (due
 to a die command) - only restore the mingw/msys link if it was saved before -
 weekly builds should be on Monday, not Tuesday - upload tag rebuilds to a
 directory named 'releases' instead of 'tags'

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@20465 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/build_package.sh | 2 +-
 packaging/win32/functions.sh     | 9 ++++++---
 packaging/win32/weekly_build.sh  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packaging/win32/build_package.sh b/packaging/win32/build_package.sh
index e2b674d17b..8ce3685372 100644
--- a/packaging/win32/build_package.sh
+++ b/packaging/win32/build_package.sh
@@ -79,7 +79,7 @@ fi
 if [ `hostname` = "gnucash-win32" ]; then
   # Determine where to upload to
   if $(echo $REPOS_URL | grep -q tags); then
-    TARGET_DIR=tags
+    TARGET_DIR=releases
   else
     TARGET_DIR=${REPOS_URL##*/}
   fi
diff --git a/packaging/win32/functions.sh b/packaging/win32/functions.sh
index 7bd37ca0c4..c68ecc051e 100644
--- a/packaging/win32/functions.sh
+++ b/packaging/win32/functions.sh
@@ -121,6 +121,7 @@ function die() {
     echo
     [ "$*" ] && echo "!!! $* !!!"
     echo "!!! ABORTING !!!"
+    restore_msys
     exit -1
 }
 
@@ -214,9 +215,11 @@ function configure_msys() {
 
 function restore_msys() {
     SUFFIX=$1
-    echo "resetting msys to use original mingw."
-    rm /etc/fstab
-    mv /etc/fstab.$SUFFIX /etc/fstab
+    if [ -f /ect/fstab.$SUFFIX ]; then
+      echo "resetting msys to use original mingw."
+      rm /etc/fstab
+      mv /etc/fstab.$SUFFIX /etc/fstab
+    fi
 }
 
 ### Local Variables: ***
diff --git a/packaging/win32/weekly_build.sh b/packaging/win32/weekly_build.sh
index af28c482c5..9645b953d8 100644
--- a/packaging/win32/weekly_build.sh
+++ b/packaging/win32/weekly_build.sh
@@ -11,7 +11,7 @@
 set -e
 
 # Only run this script on Monday night (first day of the week)
-if [ `date +%u` != 2 ] ; then exit ; fi
+if [ `date +%u` != 1 ] ; then exit ; fi
 
 function qpushd() { pushd "$@" >/dev/null; }
 function qpopd() { popd >/dev/null; }