asterixdb-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Michael Blow (Code Review)" <do-not-re...@asterixdb.incubator.apache.org>
Subject Change in asterixdb[master]: Handle Unquoted %JAVA_HOME% Containing Spaces
Date Tue, 20 Sep 2016 04:11:12 GMT
Michael Blow has submitted this change and it was merged.

Change subject: Handle Unquoted %JAVA_HOME% Containing Spaces
......................................................................


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>
---
M asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
M asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
2 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Till Westmann: Looks good to me, approved
  Jenkins: Verified; No violations found; Verified



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 @@
   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
 )
 
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 @@
 )
 
 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
 )
 

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1189
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I10fafe29d76116698f97f0dd126cc5a14928586b
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mblow@apache.org>
Gerrit-Reviewer: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mblow@apache.org>
Gerrit-Reviewer: Till Westmann <tillw@apache.org>

Mime
View raw message