You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2016/11/23 20:00:58 UTC

nifi git commit: NIFI-3092 This closes #1268. Double quoting java invocation in bat files with %*

Repository: nifi
Updated Branches:
  refs/heads/master 7ff14f719 -> cdb9b81f4


NIFI-3092 This closes #1268. Double quoting java invocation in bat files with %*


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

Branch: refs/heads/master
Commit: cdb9b81f4283052f6626a96e31e44c7da11d25a8
Parents: 7ff14f7
Author: Bryan Rosander <br...@apache.org>
Authored: Wed Nov 23 12:05:27 2016 -0500
Committer: joewitt <jo...@apache.org>
Committed: Wed Nov 23 15:00:40 2016 -0500

----------------------------------------------------------------------
 .../src/main/resources/bin/encrypt-config.bat                      | 2 +-
 nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat  | 2 +-
 .../nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat   | 2 +-
 .../nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/cdb9b81f/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
index ca1ef07..a89e3fb 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.bat
@@ -35,6 +35,6 @@ set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
 
 SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms128m -Xmx256m org.apache.nifi.properties.ConfigEncryptionTool
 
-cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %*
+cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
 
 popd

http://git-wip-us.apache.org/repos/asf/nifi/blob/cdb9b81f/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
index 6155715..7f0c0b2 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.bat
@@ -35,6 +35,6 @@ set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
 
 SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms128m -Xmx256m %JAVA_ARGS% org.apache.nifi.toolkit.s2s.SiteToSiteCliMain
 
-cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %*
+cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
 
 popd

http://git-wip-us.apache.org/repos/asf/nifi/blob/cdb9b81f/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
index 025ec10..aaf7fe5 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat
@@ -35,6 +35,6 @@ set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
 
 SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.tls.TlsToolkitMain
 
-cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %*
+cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
 
 popd

http://git-wip-us.apache.org/repos/asf/nifi/blob/cdb9b81f/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
index 86bd480..5887ea7 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat
@@ -35,6 +35,6 @@ set LIB_DIR=%~dp0..\classpath;%~dp0..\lib
 
 SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.toolkit.zkmigrator.ZooKeeperMigratorMain
 
-cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %*
+cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* ""
 
 popd