You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/12/23 15:14:01 UTC
svn commit: r1222686 - in
/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main:
distribution/windows-text/bin/ filtered-resources/bin/
Author: jbonofre
Date: Fri Dec 23 14:14:00 2011
New Revision: 1222686
URL: http://svn.apache.org/viewvc?rev=1222686&view=rev
Log:
[KARAF-1124] Update the bat scripts to handle the path with braces
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/stop.bat
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat?rev=1222686&r1=1222685&r2=1222686&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat Fri Dec 23 14:14:00 2011
@@ -60,28 +60,28 @@ if not "%KARAF_HOME%" == "" (
)
set KARAF_HOME=%DIRNAME%..
if not exist "%KARAF_HOME%" (
- call :warn KARAF_HOME is not valid: %KARAF_HOME%
+ call :warn KARAF_HOME is not valid: "%KARAF_HOME%"
goto END
)
if not "%KARAF_BASE%" == "" (
if not exist "%KARAF_BASE%" (
- call :warn KARAF_BASE is not valid: %KARAF_BASE%
+ call :warn KARAF_BASE is not valid: "%KARAF_BASE%"
goto END
)
)
if "%KARAF_BASE%" == "" (
- set KARAF_BASE=%KARAF_HOME%
+ set "KARAF_BASE=%KARAF_HOME%"
)
if not "%KARAF_DATA%" == "" (
if not exist "%KARAF_DATA%" (
- call :warn KARAF_DATA is not valid: %KARAF_DATA%
+ call :warn KARAF_DATA is not valid: "%KARAF_DATA%"
goto END
)
)
if "%KARAF_DATA%" == "" (
- set KARAF_DATA=%KARAF_BASE%\data
+ set "KARAF_DATA=%KARAF_BASE%\data"
)
set LOCAL_CLASSPATH=%CLASSPATH%
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat?rev=1222686&r1=1222685&r2=1222686&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat Fri Dec 23 14:14:00 2011
@@ -52,18 +52,18 @@ if not "%KARAF_HOME%" == "" (
)
set KARAF_HOME=%DIRNAME%..
if not exist "%KARAF_HOME%" (
- call :warn KARAF_HOME is not valid: %KARAF_HOME%
+ call :warn KARAF_HOME is not valid: "%KARAF_HOME%"
goto END
)
if not "%KARAF_BASE%" == "" (
if not exist "%KARAF_BASE%" (
- call :warn KARAF_BASE is not valid: %KARAF_BASE%
+ call :warn KARAF_BASE is not valid: "%KARAF_BASE%"
goto END
)
)
if "%KARAF_BASE%" == "" (
- set KARAF_BASE=%KARAF_HOME%
+ set "KARAF_BASE=%KARAF_HOME%"
)
:EXECUTE
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/stop.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/stop.bat?rev=1222686&r1=1222685&r2=1222686&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/stop.bat (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/stop.bat Fri Dec 23 14:14:00 2011
@@ -52,18 +52,18 @@ if not "%KARAF_HOME%" == "" (
)
set KARAF_HOME=%DIRNAME%..
if not exist "%KARAF_HOME%" (
- call :warn KARAF_HOME is not valid: %KARAF_HOME%
+ call :warn KARAF_HOME is not valid: "%KARAF_HOME%"
goto END
)
if not "%KARAF_BASE%" == "" (
if not exist "%KARAF_BASE%" (
- call :warn KARAF_BASE is not valid: %KARAF_BASE%
+ call :warn KARAF_BASE is not valid: "%KARAF_BASE%"
goto END
)
)
if "%KARAF_BASE%" == "" (
- set KARAF_BASE=%KARAF_HOME%
+ set "KARAF_BASE=%KARAF_HOME%"
)
:EXECUTE
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat?rev=1222686&r1=1222685&r2=1222686&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat Fri Dec 23 14:14:00 2011
@@ -60,28 +60,28 @@ if not "%KARAF_HOME%" == "" (
)
set KARAF_HOME=%DIRNAME%..
if not exist "%KARAF_HOME%" (
- call :warn KARAF_HOME is not valid: %KARAF_HOME%
+ call :warn KARAF_HOME is not valid: "%KARAF_HOME%"
goto END
)
if not "%KARAF_BASE%" == "" (
if not exist "%KARAF_BASE%" (
- call :warn KARAF_BASE is not valid: %KARAF_BASE%
+ call :warn KARAF_BASE is not valid: "%KARAF_BASE%"
goto END
)
)
if "%KARAF_BASE%" == "" (
- set KARAF_BASE=%KARAF_HOME%
+ set "KARAF_BASE=%KARAF_HOME%"
)
if not "%KARAF_DATA%" == "" (
if not exist "%KARAF_DATA%" (
- call :warn KARAF_DATA is not valid: %KARAF_DATA%
+ call :warn KARAF_DATA is not valid: "%KARAF_DATA%"
goto END
)
)
if "%KARAF_DATA%" == "" (
- set KARAF_DATA=%KARAF_BASE%\data
+ set "KARAF_DATA=%KARAF_BASE%\data"
)
set DEFAULT_JAVA_OPTS=
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat?rev=1222686&r1=1222685&r2=1222686&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat Fri Dec 23 14:14:00 2011
@@ -60,28 +60,28 @@ if not "%KARAF_HOME%" == "" (
)
set KARAF_HOME=%DIRNAME%..
if not exist "%KARAF_HOME%" (
- call :warn KARAF_HOME is not valid: %KARAF_HOME%
+ call :warn KARAF_HOME is not valid: "%KARAF_HOME%"
goto END
)
if not "%KARAF_BASE%" == "" (
if not exist "%KARAF_BASE%" (
- call :warn KARAF_BASE is not valid: %KARAF_BASE%
+ call :warn KARAF_BASE is not valid: "%KARAF_BASE%"
goto END
)
)
if "%KARAF_BASE%" == "" (
- set KARAF_BASE=%KARAF_HOME%
+ set "KARAF_BASE=%KARAF_HOME%"
)
if not "%KARAF_DATA%" == "" (
if not exist "%KARAF_DATA%" (
- call :warn KARAF_DATA is not valid: %KARAF_DATA%
+ call :warn KARAF_DATA is not valid: "%KARAF_DATA%"
goto END
)
)
if "%KARAF_DATA%" == "" (
- set KARAF_DATA=%KARAF_BASE%\data
+ set "KARAF_DATA=%KARAF_BASE%\data"
)
set DEFAULT_JAVA_OPTS=
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat?rev=1222686&r1=1222685&r2=1222686&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat Fri Dec 23 14:14:00 2011
@@ -60,28 +60,28 @@ if not "%KARAF_HOME%" == "" (
)
set KARAF_HOME=%DIRNAME%..
if not exist "%KARAF_HOME%" (
- call :warn KARAF_HOME is not valid: %KARAF_HOME%
+ call :warn KARAF_HOME is not valid: "%KARAF_HOME%"
goto END
)
if not "%KARAF_BASE%" == "" (
if not exist "%KARAF_BASE%" (
- call :warn KARAF_BASE is not valid: %KARAF_BASE%
+ call :warn KARAF_BASE is not valid: "%KARAF_BASE%"
goto END
)
)
if "%KARAF_BASE%" == "" (
- set KARAF_BASE=%KARAF_HOME%
+ set "KARAF_BASE=%KARAF_HOME%"
)
if not "%KARAF_DATA%" == "" (
if not exist "%KARAF_DATA%" (
- call :warn KARAF_DATA is not valid: %KARAF_DATA%
+ call :warn KARAF_DATA is not valid: "%KARAF_DATA%"
goto END
)
)
if "%KARAF_DATA%" == "" (
- set KARAF_DATA=%KARAF_BASE%\data
+ set "KARAF_DATA=%KARAF_BASE%\data"
)
set DEFAULT_JAVA_OPTS=