SLIDER-357. slider bash script cannot handle if java is in the path

Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7bc331d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7bc331d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7bc331d3

Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: 7bc331d3d37bb05ec77dbe1f0f8d0f8e7a2ec906
Parents: a6afba7
Author: Sumit Mohanty <smoha...@hortonworks.com>
Authored: Sat Aug 23 20:53:36 2014 -0700
Committer: Sumit Mohanty <smoha...@hortonworks.com>
Committed: Sat Aug 23 20:53:36 2014 -0700

----------------------------------------------------------------------
 slider-assembly/src/main/scripts/slider | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7bc331d3/slider-assembly/src/main/scripts/slider
----------------------------------------------------------------------
diff --git a/slider-assembly/src/main/scripts/slider 
b/slider-assembly/src/main/scripts/slider
index 7172917..6cd55ad 100755
--- a/slider-assembly/src/main/scripts/slider
+++ b/slider-assembly/src/main/scripts/slider
@@ -71,5 +71,5 @@ echo ""
 echo "command is java ${slider_jvm_opts} --classpath \"${slider_classpath}\" 
${launcher} $@"
 echo ""
 echo ""
-type java >/dev/null 2>&1 || javabin=${JAVA_HOME}/bin
-exec ${javabin}/java ${slider_jvm_opts}  ${launcher} $@
+type java >/dev/null 2>&1 || javabin=${JAVA_HOME}/bin/
+exec ${javabin}java ${slider_jvm_opts}  ${launcher} $@

Reply via email to