[jsword-svn] r1112 - trunk/bibledesktop/etc/bin

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2006-07-31 13:03:31 -0700 (Mon, 31 Jul 2006)
New Revision: 1112

Modified:
   trunk/bibledesktop/etc/bin/BibleDesktop.bat
   trunk/bibledesktop/etc/bin/BibleDesktop.sh
Log:
Changed the cwd in the batch files to the "JSword" directory.

Modified: trunk/bibledesktop/etc/bin/BibleDesktop.bat
===================================================================
--- trunk/bibledesktop/etc/bin/BibleDesktop.bat	2006-07-26 20:14:37 UTC (rev 1111)
+++ trunk/bibledesktop/etc/bin/BibleDesktop.bat	2006-07-31 20:03:31 UTC (rev 1112)
@@ -9,11 +9,13 @@
 set DEFAULT_JSWORD=
 if exist "%JSWORD%" goto DoneFindJSword
 REM have a blind guess ...
-if not exist "C:\Progra~1\JSword" goto FailedFindJSword
-set JSWORD=C:\Progra~1\JSword
+if not exist "C:\Progra~1\CrossW~1\BibleD~1" goto FailedFindJSword
+set JSWORD=C:\Progra~1\CrossW~1\BibleD~1
 :DoneFindJSword
 echo "Using JSWORD=%JSWORD%"
 
+cd %JSWORD%
+
 REM STEP 3 - Setup the classpath
 set LOCALCLASSPATH=%CLASSPATH%
 for %%i in ("%JSWORD%\*.jar") do call "%JSWORD%\lcp.bat" %%i
@@ -26,7 +28,7 @@
 goto End
 
 :FailedFindJSword
-echo "Can't find install directory. Please use C:\Progra~1\JSword or set the JSWORD variable"
+echo "Can't find install directory. Please use C:\Program Files\CrossWire\BibleDesktop or set the JSWORD variable"
 
 :End
 set LOCALCLASSPATH=

Modified: trunk/bibledesktop/etc/bin/BibleDesktop.sh
===================================================================
--- trunk/bibledesktop/etc/bin/BibleDesktop.sh	2006-07-26 20:14:37 UTC (rev 1111)
+++ trunk/bibledesktop/etc/bin/BibleDesktop.sh	2006-07-31 20:03:31 UTC (rev 1112)
@@ -43,6 +43,8 @@
   JSWORD=`cd "$JSWORD" && pwd`
 fi
 
+cd $JSWORD
+
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
   [ -n "$JSWORD" ] &&