[Jython-checkins] SF.net SVN: jython:[5397] trunk/jython/src/shell/jython.bat

[<otm...@us...>]

Revision: 5397
          http://jython.svn.sourceforge.net/jython/?rev=5397&view=rev
Author:   otmarhumbel
Date:     2008-10-15 08:10:37 +0000 (Wed, 15 Oct 2008)

Log Message:
-----------
safely test if JAVA_HOME or JYTHON_HOME is set

we can now handle both quoted and unquoted settings like:
  JAVA_HOME=C:\Program Files\Java\jdk1.6.0_07
  JAVA_HOME="C:\Program Files\Java\jdk1.6.0_07"

this should fix issue #1125

Modified Paths:
--------------
    trunk/jython/src/shell/jython.bat

Modified: trunk/jython/src/shell/jython.bat
===================================================================
--- trunk/jython/src/shell/jython.bat	2008-10-15 05:35:53 UTC (rev 5396)
+++ trunk/jython/src/shell/jython.bat	2008-10-15 08:10:37 UTC (rev 5397)
@@ -17,12 +17,18 @@
 rem ----- Verify and set required environment variables -----------------------
 
 set _JAVA_CMD=java
-if not [%JAVA_HOME%] == [] (
+rem remove surrounding quotes from java home, to be able to safely empty-test it
+set _TRIMMED_JAVA_HOME=%JAVA_HOME%
+for /f "useback tokens=*" %%a in ('%_TRIMMED_JAVA_HOME%') do set _TRIMMED_JAVA_HOME=%%~a
+if not "%_TRIMMED_JAVA_HOME%"=="" (
    set _JAVA_CMD="%JAVA_HOME:"=%\bin\java"
 )
 
 set _JYTHON_HOME=%JYTHON_HOME%
-if not [%JYTHON_HOME%] == [] goto gotHome
+rem remove surrounding quotes from jython home, to be able to safely empty-test it
+set _TRIMMED_JYTHON_HOME=%JYTHON_HOME%
+for /f "useback tokens=*" %%a in ('%_TRIMMED_JYTHON_HOME%') do set _TRIMMED_JYTHON_HOME=%%~a
+if not "%_TRIMMED_JYTHON_HOME%"=="" goto gotHome
 pushd "%~dp0%\.."
 set _JYTHON_HOME="%CD%"
 popd
@@ -84,7 +90,7 @@
 if ["%_CMP%"] == ["--"] goto argsDone
 
 if ["%_CMP%"] == ["--jdb"] (
-   if [%JAVA_HOME%] == [] (
+   if "%_TRIMMED_JAVA_HOME%"=="" (
       set _JAVA_CMD=jdb
    ) else (
       set _JAVA_CMD="%JAVA_HOME:"=%\bin\jdb"
@@ -145,6 +151,8 @@
 set _JAVA_OPTS=
 set _JAVA_STACK=
 set _JYTHON_HOME=
+set _TRIMMED_JAVA_HOME=
+set _TRIMMED_JYTHON_HOME=
 
 :finish
 exit /b %E%


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.