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 2014/12/25 04:12:27 UTC
incubator-nifi git commit: NIFI-200 added quotes around appropriate
path to allow space to work and ensured nifi root was set properly/tested on
paths with spaces and without
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 9b0a9a641 -> ac3c3bb4d
NIFI-200 added quotes around appropriate path to allow space to work and ensured nifi root was set properly/tested on paths with spaces and without
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ac3c3bb4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ac3c3bb4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ac3c3bb4
Branch: refs/heads/develop
Commit: ac3c3bb4d5b18329aa48d4663ca8eda9420f2b83
Parents: 9b0a9a6
Author: joewitt <jo...@apache.org>
Authored: Wed Dec 24 22:12:09 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Wed Dec 24 22:12:09 2014 -0500
----------------------------------------------------------------------
.../resources/src/main/resources/bin/nifi-status.bat | 7 ++++---
.../framework/resources/src/main/resources/bin/run-nifi.bat | 7 ++++---
.../resources/src/main/resources/bin/start-nifi.bat | 8 ++++----
.../framework/resources/src/main/resources/bin/stop-nifi.bat | 7 ++++---
4 files changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ac3c3bb4/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat
index d00f31c..07dd6c7 100644
--- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat
+++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat
@@ -1,5 +1,4 @@
@echo off
-
rem
rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with
@@ -20,8 +19,10 @@ rem
rem Use JAVA_HOME if it's set; otherwise, just use java
IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
-SET LIB_DIR=%~dp0..\lib\bootstrap
-SET CONF_DIR=%~dp0..\conf
+SET NIFI_ROOT=%~dp0..\
+CD /d "%NIFI_ROOT%"
+SET LIB_DIR=lib\bootstrap
+SET CONF_DIR=conf
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ac3c3bb4/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat
index 5bab388..03123d6 100644
--- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat
+++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat
@@ -16,12 +16,13 @@ rem See the License for the specific language governing permissions and
rem limitations under the License.
rem
-
rem Use JAVA_HOME if it's set; otherwise, just use java
IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
-SET LIB_DIR=%~dp0..\lib\bootstrap
-SET CONF_DIR=%~dp0..\conf
+SET NIFI_ROOT=%~dp0..\
+CD /d "%NIFI_ROOT%"
+SET LIB_DIR=lib\bootstrap
+SET CONF_DIR=conf
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ac3c3bb4/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat
index 882b719..6cc8733 100644
--- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat
+++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat
@@ -1,5 +1,4 @@
@echo off
-
rem
rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with
@@ -17,12 +16,13 @@ rem See the License for the specific language governing permissions and
rem limitations under the License.
rem
-
rem Use JAVA_HOME if it's set; otherwise, just use java
IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
-SET LIB_DIR=%~dp0..\lib\bootstrap
-SET CONF_DIR=%~dp0..\conf
+SET NIFI_ROOT=%~dp0..\
+CD /d "%NIFI_ROOT%"
+SET LIB_DIR=lib\bootstrap
+SET CONF_DIR=conf
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ac3c3bb4/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat
index 40c2d57..e4fc81d 100644
--- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat
+++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat
@@ -1,5 +1,4 @@
@echo off
-
rem
rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with
@@ -20,8 +19,10 @@ rem
rem Use JAVA_HOME if it's set; otherwise, just use java
IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
-SET LIB_DIR=%~dp0..\lib\bootstrap
-SET CONF_DIR=%~dp0..\conf
+SET NIFI_ROOT=%~dp0..\
+CD /d "%NIFI_ROOT%"
+SET LIB_DIR=lib\bootstrap
+SET CONF_DIR=conf
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%