From 060e5196847b33680ba90377861c27e126f627a9 Mon Sep 17 00:00:00 2001 From: Bryan Rosander Date: Wed, 23 Nov 2016 12:05:27 -0500 Subject: [PATCH] NIFI-3092 - Double quoting java invocation in bat files with %* --- .../src/main/resources/bin/encrypt-config.bat | 2 +- .../nifi-toolkit-assembly/src/main/resources/bin/s2s.bat | 2 +- .../src/main/resources/bin/tls-toolkit.bat | 2 +- .../src/main/resources/bin/zk-migrator.bat | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 ca1ef07040a9..a89e3fbcfffc 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 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 61557156fe4d..7f0c0b260e5a 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 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 025ec1087898..aaf7fe59f0dc 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 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 86bd4807edbc..5887ea706ffa 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