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

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2006-08-02 19:02:37 -0700 (Wed, 02 Aug 2006)
New Revision: 1116

Modified:
   trunk/bibledesktop/etc/bin/BibleDesktop.bat
Log:
improve guessing as to the location of JSword and Sword.

Modified: trunk/bibledesktop/etc/bin/BibleDesktop.bat
===================================================================
--- trunk/bibledesktop/etc/bin/BibleDesktop.bat	2006-08-02 00:55:48 UTC (rev 1115)
+++ trunk/bibledesktop/etc/bin/BibleDesktop.bat	2006-08-03 02:02:37 UTC (rev 1116)
@@ -3,14 +3,17 @@
 REM @echo off
 if "%OS%"=="Windows_NT" @setlocal
 
+REM Win98 does not define ProgramFiles, XP, 2000, do...
+if "%ProgramFiles%"=="" set ProgramFiles="C:\Program~1"
+
 REM STEP 2 - Check we know where we are installed
 set DEFAULT_JSWORD=%~dp0
 if "%JSWORD%"=="" set JSWORD=%DEFAULT_JSWORD%
 set DEFAULT_JSWORD=
 if exist "%JSWORD%" goto DoneFindJSword
 REM have a blind guess ...
-if not exist "C:\Progra~1\CrossW~1\BibleD~1" goto FailedFindJSword
-set JSWORD=C:\Progra~1\CrossW~1\BibleD~1
+if not exist "%ProgramFiles%\CrossW~1\BibleD~1" goto FailedFindJSword
+set JSWORD=%ProgramFiles%\CrossW~1\BibleD~1
 :DoneFindJSword
 echo "Using JSWORD=%JSWORD%"
 
@@ -24,7 +27,7 @@
 REM -Xmx256M
 REM "-Djava.endorsed.dirs=%JSWORD%\lib"
 REM -classpath "%JSWORD%\resource"
-"%JAVA_HOME%\bin\java.exe" -classpath "%LOCALCLASSPATH%" org.crosswire.bibledesktop.desktop.Desktop
+"%JAVA_HOME%\bin\java.exe" -classpath "%LOCALCLASSPATH%" -Dsword.home="%SWORD_HOME%" org.crosswire.bibledesktop.desktop.Desktop
 goto End
 
 :FailedFindJSword