Repository: nifi Updated Branches: refs/heads/master d1f2492de -> 97d2d3042
NIFI-3131 - Qualifying nifi-env in nifi bat scripts, removing popd from toolkit bat scripts This closes #1293 Signed-off-by: Bryan Rosander <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/97d2d304 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/97d2d304 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/97d2d304 Branch: refs/heads/master Commit: 97d2d30423b023abdf9c582d4590ddc8fe41a4d8 Parents: d1f2492 Author: Bryan Rosander <[email protected]> Authored: Fri Dec 2 17:12:44 2016 -0500 Committer: Bryan Rosander <[email protected]> Committed: Mon Dec 5 23:03:41 2016 -0500 ---------------------------------------------------------------------- .../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 - .../nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.bat | 1 - .../nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.bat | 1 - 7 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/97d2d304/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/dump-nifi.bat ---------------------------------------------------------------------- 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 0cbde4a..e980a6e 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 http://git-wip-us.apache.org/repos/asf/nifi/blob/97d2d304/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/run-nifi.bat ---------------------------------------------------------------------- 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 2a83e60..7629abc 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 http://git-wip-us.apache.org/repos/asf/nifi/blob/97d2d304/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/status-nifi.bat ---------------------------------------------------------------------- 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 708c650..a0980ac 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 http://git-wip-us.apache.org/repos/asf/nifi/blob/97d2d304/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 a89e3fb..f0b0e9c 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 http://git-wip-us.apache.org/repos/asf/nifi/blob/97d2d304/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 7f0c0b2..54223c7 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 http://git-wip-us.apache.org/repos/asf/nifi/blob/97d2d304/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 aaf7fe5..2188a1b 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 http://git-wip-us.apache.org/repos/asf/nifi/blob/97d2d304/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 5887ea7..481f00b 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
