You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/10/17 00:57:20 UTC
git commit: SLIDER-530. slider command should give preference to
JAVA_HOME if set (Thomas Liu via smohanty)
Repository: incubator-slider
Updated Branches:
refs/heads/develop 0b419a8bd -> 2f08b2da8
SLIDER-530. slider command should give preference to JAVA_HOME if set (Thomas Liu via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/2f08b2da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2f08b2da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2f08b2da
Branch: refs/heads/develop
Commit: 2f08b2da869be718640f15594cd9db72deb8ac2d
Parents: 0b419a8
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Oct 16 15:57:09 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Oct 16 15:57:09 2014 -0700
----------------------------------------------------------------------
slider-assembly/src/main/scripts/slider | 10 +++++++++-
slider-assembly/src/main/scripts/slider.py | 11 +++++++----
2 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2f08b2da/slider-assembly/src/main/scripts/slider
----------------------------------------------------------------------
diff --git a/slider-assembly/src/main/scripts/slider b/slider-assembly/src/main/scripts/slider
index dac20cc..0b666e8 100755
--- a/slider-assembly/src/main/scripts/slider
+++ b/slider-assembly/src/main/scripts/slider
@@ -76,5 +76,13 @@ export CLASSPATH="${slider_classpath}"
#echo ""
#echo ""
-type java >/dev/null 2>&1 || javabin=${JAVA_HOME}/bin/
+if [ -n "${JAVA_HOME}" ]; then
+ javabin=${JAVA_HOME}/bin/
+else
+ javabin=""
+fi
+
+#echo $javabin
+#type ${javabin}java 2>&1
+
exec ${javabin}java ${slider_jvm_opts} ${launcher} $@
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2f08b2da/slider-assembly/src/main/scripts/slider.py
----------------------------------------------------------------------
diff --git a/slider-assembly/src/main/scripts/slider.py b/slider-assembly/src/main/scripts/slider.py
index a17e473..2ee172e 100644
--- a/slider-assembly/src/main/scripts/slider.py
+++ b/slider-assembly/src/main/scripts/slider.py
@@ -212,8 +212,11 @@ def java(classname, args, classpath, jvm_opts_list):
# split the JVM opts by space
# java = "/usr/bin/java"
prg = "java"
- if which("java") is None:
+ if os.environ["JAVA_HOME"] is not None and os.environ["JAVA_HOME"]:
prg = os.path.join(os.environ["JAVA_HOME"], "bin", "java")
+ else:
+ prg = which("java")
+
commandline = [prg]
commandline.extend(jvm_opts_list)
commandline.append("-classpath")
@@ -254,9 +257,9 @@ def main():
+ hadoop_conf_dir
- print "slider_home = \"%s\"" % slider_home
- print "slider_jvm_opts = \"%s\"" % slider_jvm_opts
- print "slider_classpath = \"%s\"" % slider_classpath
+ #print "slider_home = \"%s\"" % slider_home
+ #print "slider_jvm_opts = \"%s\"" % slider_jvm_opts
+ #print "slider_classpath = \"%s\"" % slider_classpath
return java(SLIDER_CLASSNAME,
args,