asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mb...@apache.org
Subject asterixdb git commit: Handle Unquoted %JAVA_HOME% Containing Spaces
Date Tue, 20 Sep 2016 04:11:36 GMT
Repository: asterixdb
Updated Branches:
  refs/heads/master 2f410f4cc -> e6bb4aa45


Handle Unquoted %JAVA_HOME% Containing Spaces

Fixes sample cluster start / stop scripts on windows when the
%JAVA_HOME% variable contains spaces but is not surrounded in
%double-quotes

Change-Id: I10fafe29d76116698f97f0dd126cc5a14928586b
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1189
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <tillw@apache.org>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/e6bb4aa4
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/e6bb4aa4
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/e6bb4aa4

Branch: refs/heads/master
Commit: e6bb4aa457bb9dd3367ce03e7d0c95550e28feae
Parents: 2f410f4
Author: Michael Blow <mblow@apache.org>
Authored: Mon Sep 19 17:14:12 2016 -0400
Committer: Michael Blow <mblow@apache.org>
Committed: Mon Sep 19 21:11:10 2016 -0700

----------------------------------------------------------------------
 .../src/main/samples/local/bin/start-sample-cluster.bat           | 3 ++-
 .../src/main/samples/local/bin/stop-sample-cluster.bat            | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e6bb4aa4/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
b/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
index 4d10261..db86560 100644
--- a/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
+++ b/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
@@ -24,7 +24,8 @@ if NOT DEFINED JAVA_HOME (
   goto :ERROR
 )
 REM ensure JAVA_HOME has no spaces nor quotes, since appassembler can't handle them
-for %%I in (%JAVA_HOME%) do (
+set JAVA_HOME=%JAVA_HOME:"=%
+for %%I in ("%JAVA_HOME%") do (
   set JAVA_HOME=%%~sI
 )
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e6bb4aa4/asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat b/asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
index dfd1ada..d1f31b0 100644
--- a/asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
+++ b/asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
@@ -24,7 +24,8 @@ if NOT DEFINED JAVA_HOME (
 )
 
 REM ensure JAVA_HOME has no spaces nor quotes, since appassembler can't handle them
-for %%I in (%JAVA_HOME%) do (
+set JAVA_HOME=%JAVA_HOME:"=%
+for %%I in ("%JAVA_HOME%") do (
   set JAVA_HOME=%%~sI
 )
 


Mime
View raw message