geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r486381 - in /geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin: deploy.bat geronimo.bat shutdown.bat startup.bat
Date Tue, 12 Dec 2006 22:45:48 GMT
Author: dain
Date: Tue Dec 12 14:45:47 2006
New Revision: 486381

URL: http://svn.apache.org/viewvc?view=rev&rev=486381
Log:
Applied GERONIMO-2555 Windows scripts don't work when used from different drive
Thanks for the patch Mark DeLaFranier

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat?view=diff&rev=486381&r1=486380&r2=486381
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat
Tue Dec 12 14:45:47 2006
@@ -115,9 +115,9 @@
 @REM resolve .. and remove any trailing slashes
 :resolveHome
 set CURRENT_DIR=%cd%
-cd %GERONIMO_HOME%
+cd /d %GERONIMO_HOME%
 set GERONIMO_HOME=%cd%
-cd %CURRENT_DIR%
+cd /d %CURRENT_DIR%
 
 :gotHome
 if exist "%GERONIMO_HOME%\bin\deploy.bat" goto okHome

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat?view=diff&rev=486381&r1=486380&r2=486381
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
Tue Dec 12 14:45:47 2006
@@ -152,9 +152,9 @@
 @REM resolve .. and remove any trailing slashes
 :resolveHome
 set CURRENT_DIR=%cd%
-cd %GERONIMO_HOME%
+cd /d %GERONIMO_HOME%
 set GERONIMO_HOME=%cd%
-cd %CURRENT_DIR%
+cd /d %CURRENT_DIR%
 
 :gotHome
 if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat?view=diff&rev=486381&r1=486380&r2=486381
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat
Tue Dec 12 14:45:47 2006
@@ -56,20 +56,24 @@
 :okOsCheck
 setlocal
 
-@REM Guess GERONIMO_HOME if not defined
+if not "%GERONIMO_HOME%" == "" goto resolveHome
+@REM %~dp0 is expanded pathname of the current script
+set GERONIMO_HOME=%~dp0..
+
+@REM resolve .. and remove any trailing slashes
+:resolveHome
 set CURRENT_DIR=%cd%
-if not "%GERONIMO_HOME%" == "" goto gotHome
-set GERONIMO_HOME=%CURRENT_DIR%
-if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
-cd ..
+cd /d %GERONIMO_HOME%
 set GERONIMO_HOME=%cd%
-cd %CURRENT_DIR%
+cd /d %CURRENT_DIR%
+
 :gotHome
 if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
 echo The GERONIMO_HOME environment variable is not defined correctly
 echo This environment variable is needed to run this program
 set ERRORLEVEL=1
 goto end
+
 :okHome
 
 set EXECUTABLE=%GERONIMO_HOME%\bin\geronimo.bat

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat?view=diff&rev=486381&r1=486380&r2=486381
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat
Tue Dec 12 14:45:47 2006
@@ -52,14 +52,17 @@
 :okOsCheck
 setlocal
 
-@REM Guess GERONIMO_HOME if not defined
+if not "%GERONIMO_HOME%" == "" goto resolveHome
+@REM %~dp0 is expanded pathname of the current script
+set GERONIMO_HOME=%~dp0..
+
+@REM resolve .. and remove any trailing slashes
+:resolveHome
 set CURRENT_DIR=%cd%
-if not "%GERONIMO_HOME%" == "" goto gotHome
-set GERONIMO_HOME=%CURRENT_DIR%
-if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
-cd ..
+cd /d %GERONIMO_HOME%
 set GERONIMO_HOME=%cd%
-cd %CURRENT_DIR%
+cd /d %CURRENT_DIR%
+
 :gotHome
 if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
 echo The GERONIMO_HOME environment variable is not defined correctly



Mime
View raw message