From 683c8dde9544acc9de0b4842e44df8a91778c7b2 Mon Sep 17 00:00:00 2001 From: Bryan Rosander Date: Fri, 2 Dec 2016 17:12:44 -0500 Subject: [PATCH] NIFI-3131 - Qualifying nifi-env in nifi bat scripts, removing popd from toolkit bat scripts --- .../nifi-resources/src/main/resources/bin/dump-nifi.bat | 2 +- .../nifi-resources/src/main/resources/bin/run-nifi.bat | 2 +- .../nifi-resources/src/main/resources/bin/status-nifi.bat | 4 ++-- .../src/main/resources/bin/encrypt-config.bat | 1 - .../nifi-toolkit-assembly/src/main/resources/bin/s2s.bat | 1 - .../src/main/resources/bin/tls-toolkit.bat | 1 - .../src/main/resources/bin/zk-migrator.bat | 1 - 7 files changed, 4 insertions(+), 8 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/dump-nifi.bat b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/dump-nifi.bat index 0cbde4ab718d..e980a6eae959 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/dump-nifi.bat +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/dump-nifi.bat @@ -18,7 +18,7 @@ rem rem Set environment variables -call nifi-env.bat +call %~sdp0\nifi-env.bat rem Use JAVA_HOME if it's set; otherwise, just use java diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/run-nifi.bat b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/run-nifi.bat index 2a83e60313ce..7629abcd28e7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/run-nifi.bat +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/run-nifi.bat @@ -18,7 +18,7 @@ rem rem Set environment variables -call nifi-env.bat +call %~sdp0\nifi-env.bat rem Use JAVA_HOME if it's set; otherwise, just use java diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/status-nifi.bat b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/status-nifi.bat index 708c650f0132..a0980ac3a1dc 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/status-nifi.bat +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/status-nifi.bat @@ -17,7 +17,7 @@ rem limitations under the License. rem -call nifi-env.bat +call %~sdp0\nifi-env.bat rem Use JAVA_HOME if it's set; otherwise, just use java @@ -46,4 +46,4 @@ set BOOTSTRAP_ACTION=status cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %BOOTSTRAP_ACTION% -popd \ No newline at end of file +popd 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 a89e3fbcfffc..f0b0e9c19997 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 @@ -37,4 +37,3 @@ SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms128m -Xmx256m org.apache.nifi.properties.Con 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 7f0c0b260e5a..54223c70ebf4 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 @@ -37,4 +37,3 @@ SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms128m -Xmx256m %JAVA_ARGS% org.apache.nifi.to 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 aaf7fe59f0dc..2188a1b77eb0 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 @@ -37,4 +37,3 @@ SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.tool 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 5887ea706ffa..481f00b1b7f1 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 @@ -37,4 +37,3 @@ SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS% org.apache.nifi.tool cmd.exe /C ""%JAVA_EXE%" %JAVA_PARAMS% %* "" -popd