You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/03/30 14:22:39 UTC

storm git commit: Merge branch 'master' of https://github.com/jnioche/storm into STORM-3011

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 059f7db6b -> 649ad60fa


Merge branch 'master' of https://github.com/jnioche/storm into STORM-3011

STORM-3011: Use default bin path in flight.bash if JAVA_HOME is undefined

This closes #2609


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/649ad60f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/649ad60f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/649ad60f

Branch: refs/heads/1.x-branch
Commit: 649ad60fa5dfd38ca4f3e847618bba23486fc1ba
Parents: 059f7db
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri Mar 30 09:21:10 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri Mar 30 09:22:25 2018 -0500

----------------------------------------------------------------------
 bin/flight.bash | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/649ad60f/bin/flight.bash
----------------------------------------------------------------------
diff --git a/bin/flight.bash b/bin/flight.bash
index 36b98ba..dc754b6 100755
--- a/bin/flight.bash
+++ b/bin/flight.bash
@@ -33,7 +33,11 @@ elif [[ "$unamestr" == 'FreeBSD' ]]; then
 fi
 
 if [[ $platform == 'linux' ]]; then
-    BINPATH="$JDKPATH/bin"
+    if [ -z "$JDKPATH" ]; then
+        BINPATH="/usr/bin"
+    else
+        BINPATH="$JDKPATH/bin"
+    fi
 elif [[ $platform == 'darwin' ]]; then
     BINPATH="/usr/bin"
 fi