You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by js...@apache.org on 2006/01/18 09:11:01 UTC

svn commit: r370076 - /geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat

Author: jsisson
Date: Wed Jan 18 00:10:49 2006
New Revision: 370076

URL: http://svn.apache.org/viewcvs?rev=370076&view=rev
Log:
GERONIMO-1344 - Fix issue where you get Java usage help when a trailing slash '/' is in GERONIMO_HOME environment variable

Modified:
    geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat

Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat?rev=370076&r1=370075&r2=370076&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat (original)
+++ geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat Wed Jan 18 00:10:49 2006
@@ -105,11 +105,14 @@
 :okOsCheck
 setlocal
 
-if not "%GERONIMO_HOME%" == "" goto gotHome
-set CURRENT_DIR=%cd%
+if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
-cd %~dp0..
-@REM reference %cd% to resolve ..
+set GERONIMO_HOME=%~dp0..
+
+@REM resolve .. and remove any trailing slashes
+:resolveHome
+set CURRENT_DIR=%cd%
+cd %GERONIMO_HOME%
 set GERONIMO_HOME=%cd%
 cd %CURRENT_DIR%