Repository: incubator-zeppelin Updated Branches: refs/heads/master 5a1f74f0d -> fb4a76a20
Fix interpreter.sh classpath ### What is this PR for? This PR apply fix #769 again, which is reverted by #208. Also removing unnecessary code from interpreter.sh ### What type of PR is it? Bug Fix ### Todos * [x] - Apply #769 again * [x] - Remove unnecessary code ### What is the Jira issue? ### How should this be tested? ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Lee moon soo <[email protected]> Closes #889 from Leemoonsoo/fix_interpreter_sh_classpath and squashes the following commits: 8468fd5 [Lee moon soo] Remove unnecessary construction of classpath ea8fee8 [Lee moon soo] Apply pr769 again, reverted by pr208 Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/fb4a76a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/fb4a76a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/fb4a76a2 Branch: refs/heads/master Commit: fb4a76a20eb1677192bec337c42e22420b3474c1 Parents: 5a1f74f Author: Lee moon soo <[email protected]> Authored: Thu May 12 08:05:52 2016 -0700 Committer: Lee moon soo <[email protected]> Committed: Thu May 19 11:37:03 2016 -0700 ---------------------------------------------------------------------- bin/interpreter.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/fb4a76a2/bin/interpreter.sh ---------------------------------------------------------------------- diff --git a/bin/interpreter.sh b/bin/interpreter.sh index 17c9028..69c94f6 100755 --- a/bin/interpreter.sh +++ b/bin/interpreter.sh @@ -85,10 +85,7 @@ if [[ "${INTERPRETER_ID}" == "spark" ]]; then export SPARK_SUBMIT="${SPARK_HOME}/bin/spark-submit" SPARK_APP_JAR="$(ls ${ZEPPELIN_HOME}/interpreter/spark/zeppelin-spark*.jar)" # This will evantually passes SPARK_APP_JAR to classpath of SparkIMain - ZEPPELIN_CLASSPATH=${SPARK_APP_JAR} - # Need to add the R Interpreter - RZEPPELINPATH="$(ls ${ZEPPELIN_HOME}/interpreter/spark/zeppelin-zr*.jar)" - ZEPPELIN_CLASSPATH="${ZEPPELIN_CLASSPATH}:${RZEPPELINPATH}" + ZEPPELIN_CLASSPATH+=${SPARK_APP_JAR} pattern="$SPARK_HOME/python/lib/py4j-*-src.zip" py4j=($pattern) @@ -133,8 +130,6 @@ if [[ "${INTERPRETER_ID}" == "spark" ]]; then ZEPPELIN_CLASSPATH+=":${HADOOP_CONF_DIR}" fi - RZEPPELINPATH="$(ls ${ZEPPELIN_HOME}/interpreter/spark/zeppelin-zr*.jar)" - ZEPPELIN_CLASSPATH="${ZEPPELIN_CLASSPATH}:${RZEPPELINPATH}" export SPARK_CLASSPATH+=":${ZEPPELIN_CLASSPATH}" fi elif [[ "${INTERPRETER_ID}" == "hbase" ]]; then
