r14735 - gnucash/trunk/packaging/win32 - Make the win32 script run even from outside of the its directory.

[Andreas Köhler]

Author: andi5
Date: 2006-08-26 20:29:52 -0400 (Sat, 26 Aug 2006)
New Revision: 14735
Trac: http://svn.gnucash.org/trac/changeset/14735

Modified:
   gnucash/trunk/packaging/win32/README
   gnucash/trunk/packaging/win32/install.sh
Log:
Make the win32 script run even from outside of the its directory.


Modified: gnucash/trunk/packaging/win32/README
===================================================================
--- gnucash/trunk/packaging/win32/README	2006-08-26 23:11:15 UTC (rev 14734)
+++ gnucash/trunk/packaging/win32/README	2006-08-27 00:29:52 UTC (rev 14735)
@@ -23,7 +23,7 @@
 
 Start/Enter any MSYS shell. Let the automated build begin by:
 
-  $INSTALLER_DIR/installer.sh
+  $INSTALLER_DIR/install.sh
 
 Good luck!
 

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2006-08-26 23:11:15 UTC (rev 14734)
+++ gnucash/trunk/packaging/win32/install.sh	2006-08-27 00:29:52 UTC (rev 14735)
@@ -2,10 +2,21 @@
 
 set -e
 
-function add_step() {
-    steps=("${steps[@]}" "$@")
+function add_step() { steps=("${steps[@]}" "$@"); }
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
+
+# c:/dir/sub
+function win_fs_path() {
+    echo "$*" | sed 's,\\,/,g'
 }
 
+# /c/dir/sub
+function unix_path() {
+    echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'
+}
+
+qpushd "$(dirname $(unix_path "$0"))"
 . custom.sh
 
 SEPS_ACLOCAL_FLAGS=" "
@@ -48,9 +59,6 @@
 }
 
 function quiet() { "$@" &>/dev/null; }
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-
 function add_to_env() {
     _SEP=`eval echo '"$'"SEPS_$2"'"'`
     _ENV=`eval echo '"$'"$2"'"'`
@@ -66,16 +74,6 @@
     fi
 }
 
-# c:/dir/sub
-function win_fs_path() {
-    echo "$*" | sed 's,\\,/,g'
-}
-
-# /c/dir/sub
-function unix_path() {
-    echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'
-}
-
 function prepare() {
     mkdir -p $TMP_DIR
     for _ENV in $ENV_VARS; do
@@ -130,7 +128,7 @@
     else
         set -e
         smart_wget $DTK_URL $DOWNLOAD_DIR
-        echo "!!! The path must be: $MSYS_DIR !!!"
+        echo "!!! When asked for an installation path, specify $MSYS_DIR !!!"
         $DOWNLOAD_UDIR/msysDTK-*.exe
         for file in \
 	    /bin/{aclocal*,auto*,ifnames,libtool*,guile*} \
@@ -154,7 +152,7 @@
         _MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
         smart_wget $MINGW_URL $DOWNLOAD_DIR
         echo "!!! Install g++ !!!"
-        echo "!!! The path must be: $MINGW_DIR !!!"
+        echo "!!! When asked for an installation path, specify $MINGW_DIR !!!"
         $DOWNLOAD_UDIR/MinGW-*.exe
         (echo "y"; echo "y"; echo "$_MINGW_WFSDIR") | sh pi.sh
     fi
@@ -172,7 +170,7 @@
     else
         set -e
         smart_wget $UNZIP_URL $DOWNLOAD_DIR
-        echo "!!! The path must be: $UNZIP_DIR !!!"
+        echo "!!! When asked for an installation path, specify $UNZIP_DIR !!!"
         $DOWNLOAD_UDIR/unzip-*.exe
     fi
     add_to_env $_UNZIP_UDIR/bin PATH
@@ -328,7 +326,7 @@
     else
         set -e
         smart_wget $GLADE_URL $DOWNLOAD_DIR
-	echo "!!! The path must be: $GLADE_DIR !!!"
+	echo "!!! When asked for an installation path, specify $GLADE_DIR !!!"
 	$DOWNLOAD_UDIR/gtk-win32-devel-*.exe
 	qpushd $GLADE_DIR\\lib\\pkgconfig
 	    cp cairo.pc cairo.pc.bak
@@ -579,7 +577,7 @@
     else
         set -e
         smart_wget $SVN_URL $DOWNLOAD_DIR
-        echo "!!! The path must be: $SVN_DIR !!!"
+        echo "!!! When asked for an installation path, specify $SVN_DIR !!!"
         $DOWNLOAD_UDIR/svn-*.exe
     fi
 }
@@ -642,3 +640,10 @@
     eval $step
 done
 finish
+qpopd
+
+
+### Local Variables: ***
+### sh-basic-offset: 4 ***
+### tab-width: 8 ***
+### End: ***