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:21:48 UTC
[1/2] storm git commit: STORM-3011 Use default bin path in
flight.bash if JAVA_HOME is undefined
Repository: storm
Updated Branches:
refs/heads/master 6a5b32ea8 -> d72d5ae12
STORM-3011 Use default bin path in flight.bash if JAVA_HOME is undefined
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/15a5757a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/15a5757a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/15a5757a
Branch: refs/heads/master
Commit: 15a5757a6109f0840861a5004763b8611864b26c
Parents: 1811273
Author: Julien Nioche <ju...@digitalpebble.com>
Authored: Wed Mar 28 08:54:42 2018 +0100
Committer: Julien Nioche <ju...@digitalpebble.com>
Committed: Wed Mar 28 08:54:42 2018 +0100
----------------------------------------------------------------------
bin/flight.bash | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/15a5757a/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
[2/2] storm git commit: Merge branch 'master' of
https://github.com/jnioche/storm into STORM-3011
Posted by bo...@apache.org.
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/d72d5ae1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d72d5ae1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d72d5ae1
Branch: refs/heads/master
Commit: d72d5ae12271afc8540756cbb725a7d27754c811
Parents: 6a5b32e 15a5757
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:21:10 2018 -0500
----------------------------------------------------------------------
bin/flight.bash | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------