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/d8f8771b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d8f8771b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d8f8771b

Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: d8f8771b9671b3b9ef97d2892c56d59c16ff6621
Parents: 41599dc
Author: tedyu <yuzhih...@gmail.com>
Authored: Sat Aug 23 21:09:38 2014 -0700
Committer: tedyu <yuzhih...@gmail.com>
Committed: Sat Aug 23 21:09:38 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/d8f8771b/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