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 2017/11/29 01:03:30 UTC

nifi git commit: NIFI-4640 Sub source w/ . in nifi.sh to be POSIX compliant

Repository: nifi
Updated Branches:
  refs/heads/master cec276414 -> 73fa0429f


NIFI-4640 Sub source w/ . in nifi.sh to be POSIX compliant

This closes #2302

Signed-off-by: Aldrin Piri <al...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/73fa0429
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/73fa0429
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/73fa0429

Branch: refs/heads/master
Commit: 73fa0429f0dada32a1935a307dbb39308bd21f54
Parents: cec2764
Author: Joey Frazee <jf...@apache.org>
Authored: Tue Nov 28 10:26:11 2017 -0600
Committer: Aldrin Piri <al...@apache.org>
Committed: Tue Nov 28 20:02:58 2017 -0500

----------------------------------------------------------------------
 .../nifi-resources/src/main/resources/bin/nifi.sh               | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/73fa0429/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 35fdfa1..9174810 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
@@ -83,9 +83,8 @@ detectOS() {
     fi
     # In addition to those, go around the linux space and query the widely
     # adopted /etc/os-release to detect linux variants
-    if [ -f /etc/os-release ]
-    then
-        source /etc/os-release
+    if [ -f /etc/os-release ]; then
+        . /etc/os-release
     fi
 }