From d3d020c8a3faef00bba41617e51f7df73ee50dec Mon Sep 17 00:00:00 2001
From: Prabhjyot Singh <prabhjyotsingh@gmail.org>
Date: Thu, 24 Nov 2016 16:31:27 +0530
Subject: [PATCH] execute env variables in zeppelin-env.sh

---
 bin/interpreter.sh | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index 3b9b3dd3af..849ef2ca52 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -185,17 +185,25 @@ addJarInDirForIntp "${LOCAL_INTERPRETER_REPO}"
 
 CLASSPATH+=":${ZEPPELIN_INTP_CLASSPATH}"
 
-if [[ -n "${SPARK_SUBMIT}" ]]; then
-  SPARK_SUBMIT_RUN=` echo ${SPARK_SUBMIT} --class ${ZEPPELIN_SERVER} --driver-class-path \"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLASSPATH}\" --driver-java-options \"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS} ${SPARK_APP_JAR} ${PORT}`
-  if [[ -z "$ZEPPELIN_IMPERSONATE_USER" ]]; then
-    eval ${SPARK_SUBMIT_RUN} &
-  else
-    ${ZEPPELIN_IMPERSONATE_RUN_CMD} ${SPARK_SUBMIT_RUN} &
-  fi
-else
-  ${ZEPPELIN_IMPERSONATE_RUN_CMD} ${ZEPPELIN_RUNNER} ${JAVA_INTP_OPTS} ${ZEPPELIN_INTP_MEM} -cp ${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLASSPATH} ${ZEPPELIN_SERVER} ${PORT} &
+if [[ ! -z "$ZEPPELIN_IMPERSONATE_USER" ]]; then
+    INTERPRETER_RUN_COMMAND=${ZEPPELIN_IMPERSONATE_RUN_CMD}" '"
+    if [[ -f "${ZEPPELIN_CONF_DIR}/zeppelin-env.sh" ]]; then
+        INTERPRETER_RUN_COMMAND+="source "${ZEPPELIN_CONF_DIR}'/zeppelin-env.sh;'
+    fi
 fi
 
+if [[ -n "${SPARK_SUBMIT}" ]]; then
+    INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class ${ZEPPELIN_SERVER} --driver-class-path \"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLASSPATH}\" --driver-java-options \"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS} ${SPARK_APP_JAR} ${PORT}`
+else
+    INTERPRETER_RUN_COMMAND+=' '` echo ${ZEPPELIN_RUNNER} ${JAVA_INTP_OPTS} ${ZEPPELIN_INTP_MEM} -cp ${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLASSPATH} ${ZEPPELIN_SERVER} ${PORT} `
+fi
+
+if [[ ! -z "$ZEPPELIN_IMPERSONATE_USER" ]]; then
+    INTERPRETER_RUN_COMMAND+="'"
+fi
+
+eval $INTERPRETER_RUN_COMMAND &
+
 pid=$!
 if [[ -z "${pid}" ]]; then
   return 1;