Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
joewitt 2014-12-24 22:12:09 -05:00
parent 9b0a9a6415
commit ac3c3bb4d5
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/nifi-status.bat
View File

@ -1,5 +1,4 @@
@echo off @echo off
rem rem
rem Licensed to the Apache Software Foundation (ASF) under one or more rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with 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 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) IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
SET LIB_DIR=%~dp0..\lib\bootstrap SET NIFI_ROOT=%~dp0..\
SET CONF_DIR=%~dp0..\conf CD /d "%NIFI_ROOT%"
SET LIB_DIR=lib\bootstrap
SET CONF_DIR=conf
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE% SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%

7
nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/run-nifi.bat
View File

@ -16,12 +16,13 @@ rem See the License for the specific language governing permissions and
rem limitations under the License. rem limitations under the License.
rem rem
rem Use JAVA_HOME if it's set; otherwise, just use java 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) IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
SET LIB_DIR=%~dp0..\lib\bootstrap SET NIFI_ROOT=%~dp0..\
SET CONF_DIR=%~dp0..\conf CD /d "%NIFI_ROOT%"
SET LIB_DIR=lib\bootstrap
SET CONF_DIR=conf
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE% SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%

8
nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/start-nifi.bat
View File

@ -1,5 +1,4 @@
@echo off @echo off
rem rem
rem Licensed to the Apache Software Foundation (ASF) under one or more rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with 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 limitations under the License.
rem rem
rem Use JAVA_HOME if it's set; otherwise, just use java 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) IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
SET LIB_DIR=%~dp0..\lib\bootstrap SET NIFI_ROOT=%~dp0..\
SET CONF_DIR=%~dp0..\conf CD /d "%NIFI_ROOT%"
SET LIB_DIR=lib\bootstrap
SET CONF_DIR=conf
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE% SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%

7
nar-bundles/framework-bundle/framework/resources/src/main/resources/bin/stop-nifi.bat
View File

@ -1,5 +1,4 @@
@echo off @echo off
rem rem
rem Licensed to the Apache Software Foundation (ASF) under one or more rem Licensed to the Apache Software Foundation (ASF) under one or more
rem contributor license agreements. See the NOTICE file distributed with 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 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) IF "%JAVA_HOME%"=="" (SET JAVA_EXE=java) ELSE (SET JAVA_EXE=%JAVA_HOME%\bin\java.exe)
SET LIB_DIR=%~dp0..\lib\bootstrap SET NIFI_ROOT=%~dp0..\
SET CONF_DIR=%~dp0..\conf CD /d "%NIFI_ROOT%"
SET LIB_DIR=lib\bootstrap
SET CONF_DIR=conf
SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf SET BOOTSTRAP_CONF_FILE=%CONF_DIR%\bootstrap.conf
SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE% SET JAVA_ARGS=-Dorg.apache.nifi.bootstrap.config.file=%BOOTSTRAP_CONF_FILE%