geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r370077 - /geronimo/trunk/modules/scripts/src/resources/bin/geronimo.bat
Date Wed, 18 Jan 2006 08:18:58 GMT
Author: jsisson
Date: Wed Jan 18 00:18:15 2006
New Revision: 370077

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

Modified:
    geronimo/trunk/modules/scripts/src/resources/bin/geronimo.bat

Modified: geronimo/trunk/modules/scripts/src/resources/bin/geronimo.bat
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/scripts/src/resources/bin/geronimo.bat?rev=370077&r1=370076&r2=370077&view=diff
==============================================================================
--- geronimo/trunk/modules/scripts/src/resources/bin/geronimo.bat (original)
+++ geronimo/trunk/modules/scripts/src/resources/bin/geronimo.bat Wed Jan 18 00:18:15 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%
 



Mime
View raw message