You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/01/27 16:29:56 UTC
[4/5] git commit: fix classpath quoting patch by Nick Bailey and
jbellis for CASSANDRA-3744
fix classpath quoting
patch by Nick Bailey and jbellis for CASSANDRA-3744
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90e3ec44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90e3ec44
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90e3ec44
Branch: refs/heads/trunk
Commit: 90e3ec44030b31f853dfd02d6cd3a4a74d990b94
Parents: 68d4e28
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Jan 27 14:55:18 2012 +0000
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Jan 27 09:29:19 2012 -0600
----------------------------------------------------------------------
bin/json2sstable.bat | 6 +++---
bin/nodetool.bat | 3 +--
bin/sstable2json.bat | 6 +++---
bin/sstablekeys.bat | 6 +++---
4 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90e3ec44/bin/json2sstable.bat
----------------------------------------------------------------------
diff --git a/bin/json2sstable.bat b/bin/json2sstable.bat
index ceb7987..b42c34e 100644
--- a/bin/json2sstable.bat
+++ b/bin/json2sstable.bat
@@ -32,11 +32,11 @@ REM Ensure that any user defined CLASSPATH variables are not used on startup
set CLASSPATH="%CASSANDRA_HOME%\conf"
REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append %%~fi
+for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
goto okClasspath
:append
-set CLASSPATH=%CLASSPATH%;%1%2
+set CLASSPATH=%CLASSPATH%;%1
goto :eof
:okClasspath
@@ -55,7 +55,7 @@ set TOOLS_PARAMS=%TOOLS_PARAMS% %1
goto :eof
:runTool
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp "%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS%
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%" %TOOLS_PARAMS%
goto finally
:err
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90e3ec44/bin/nodetool.bat
----------------------------------------------------------------------
diff --git a/bin/nodetool.bat b/bin/nodetool.bat
index a78c1c9..200fb4a 100644
--- a/bin/nodetool.bat
+++ b/bin/nodetool.bat
@@ -24,7 +24,6 @@ REM Ensure that any user defined CLASSPATH variables are not used on startup
set CLASSPATH="%CASSANDRA_HOME%\conf"
REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
-rem for %%i in (%CASSANDRA_HOME%\lib*.jar) do call :append %%~fi
for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
goto okClasspath
@@ -39,7 +38,7 @@ goto runNodeTool
:runNodeTool
echo Starting NodeTool
-"%JAVA_HOME%\bin\java" -cp "%CASSANDRA_CLASSPATH%" -Dlog4j.configuration=log4j-tools.properties org.apache.cassandra.tools.NodeCmd %*
+"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% -Dlog4j.configuration=log4j-tools.properties org.apache.cassandra.tools.NodeCmd %*
goto finally
:err
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90e3ec44/bin/sstable2json.bat
----------------------------------------------------------------------
diff --git a/bin/sstable2json.bat b/bin/sstable2json.bat
index cc4cbce..45dcd50 100644
--- a/bin/sstable2json.bat
+++ b/bin/sstable2json.bat
@@ -32,11 +32,11 @@ REM Ensure that any user defined CLASSPATH variables are not used on startup
set CLASSPATH="%CASSANDRA_HOME%\conf"
REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append %%~fi
+for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
goto okClasspath
:append
-set CLASSPATH=%CLASSPATH%;%1%2
+set CLASSPATH=%CLASSPATH%;%1
goto :eof
:okClasspath
@@ -55,7 +55,7 @@ set TOOLS_PARAMS=%TOOLS_PARAMS% %1
goto :eof
:runTool
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp "%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS%
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%" %TOOLS_PARAMS%
goto finally
:err
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90e3ec44/bin/sstablekeys.bat
----------------------------------------------------------------------
diff --git a/bin/sstablekeys.bat b/bin/sstablekeys.bat
index 7d6446a..88b33bc 100644
--- a/bin/sstablekeys.bat
+++ b/bin/sstablekeys.bat
@@ -32,11 +32,11 @@ REM Ensure that any user defined CLASSPATH variables are not used on startup
set CLASSPATH="%CASSANDRA_HOME%\conf"
REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append %%~fi
+for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
goto okClasspath
:append
-set CLASSPATH=%CLASSPATH%;%1%2
+set CLASSPATH=%CLASSPATH%;%1
goto :eof
:okClasspath
@@ -49,7 +49,7 @@ set TOOLS_PARAMS=
goto runTool
:runTool
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp "%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %1 -e
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%" %1 -e
goto finally
:err