You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/04/27 21:21:59 UTC
nifi git commit: NIFI-1817 Respecting when run.as is commented out by
ensuring the chosen line starts with run.as optionally preceded by whitespace
Repository: nifi
Updated Branches:
refs/heads/0.x 794cbd9fa -> 7cce02d39
NIFI-1817 Respecting when run.as is commented out by ensuring the chosen line starts with run.as optionally preceded by whitespace
This closes #383.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7cce02d3
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7cce02d3
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7cce02d3
Branch: refs/heads/0.x
Commit: 7cce02d39e314aa67d352b106e4ab8a62bda4bc8
Parents: 794cbd9
Author: Aldrin Piri <al...@apache.org>
Authored: Wed Apr 27 11:18:32 2016 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Wed Apr 27 15:21:14 2016 -0400
----------------------------------------------------------------------
.../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/7cce02d3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
index 063065d..353ee13 100755
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
@@ -164,7 +164,7 @@ run() {
BOOTSTRAP_CONF="${BOOTSTRAP_CONF_DIR}/bootstrap.conf";
BOOTSTRAP_LIBS="${NIFI_HOME}/lib/bootstrap/*"
- run_as=$(grep run.as "${BOOTSTRAP_CONF}" | cut -d'=' -f2)
+ run_as=$(grep '^\s*run.as' "${BOOTSTRAP_CONF}" | cut -d'=' -f2)
# If the run as user is the same as that starting the process, ignore this configuration
if [ "$run_as" = "$(whoami)" ]; then
unset run_as