[ZEPPELIN-1530] Update common scripts for Linux and Windows platforms

### What is this PR for? Avoid forcing set the DEBUG environment variable and also review the two common scripts for Linux and Windows platforms and update with missing environment variables. ### What type of PR is it? [Bug Fix] ### What is the Jira issue? * [ZEPPELIN-1530](https://issues.apache.org/jira/browse/ZEPPELIN-1530) ### How should this be tested? CI Tests Author: Luciano Resende <[email protected]> Closes apache#1713 from lresende/ZEPPELIN-1530 and squashes the following commits: 0826750 [Luciano Resende] [ZEPPELIN-1530] Add missing environment variables on common scripts 3a5d1c2 [Luciano Resende] [ZEPPELIN-1530] Avoid forcing setting DEBUG environment property
aib628 · Dec 6, 2016 · fa31bd3 · fa31bd3
1 parent fd7a3f8
commit fa31bd3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/bin/common.cmd b/bin/common.cmd
@@ -29,10 +29,6 @@ if not defined ZEPPELIN_LOG_DIR (
     set ZEPPELIN_LOG_DIR=%ZEPPELIN_HOME%\logs
 )
 
-if not defined ZEPPELIN_NOTEBOOK_DIR (
-    set ZEPPELIN_NOTEBOOK_DIR=%ZEPPELIN_HOME%\notebook
-)
-
 if not defined ZEPPELIN_PID_DIR (
     set ZEPPELIN_PID_DIR=%ZEPPELIN_HOME%\run
 )
@@ -47,6 +43,10 @@ if not defined ZEPPELIN_WAR (
     )
 )
 
+if not defined ZEPPELIN_NOTEBOOK_DIR (
+    set ZEPPELIN_NOTEBOOK_DIR=%ZEPPELIN_HOME%\notebook
+)
+
 if not defined ZEPPELIN_INTERPRETER_DIR (
     set ZEPPELIN_INTERPRETER_DIR=%ZEPPELIN_HOME%\interpreter
 )
@@ -98,10 +98,6 @@ if not defined ZEPPELIN_IDENT_STRING (
     set ZEPPELIN_IDENT_STRING=%USERNAME%
 )
 
-if not defined DEBUG (
-    set DEBUG=0
-)
-
 if not defined ZEPPELIN_INTERPRETER_REMOTE_RUNNER (
     set ZEPPELIN_INTERPRETER_REMOTE_RUNNER=bin\interpreter.cmd
 )

diff --git a/bin/common.sh b/bin/common.sh
@@ -48,6 +48,10 @@ if [[ -z "${ZEPPELIN_WAR}" ]]; then
   fi
 fi
 
+if [[ -z "$ZEPPELIN_NOTEBOOK_DIR" ]]; then
+  export ZEPPELIN_NOTEBOOK_DIR="${ZEPPELIN_HOME}/notebook"
+fi
+
 if [[ -z "$ZEPPELIN_INTERPRETER_DIR" ]]; then
   export ZEPPELIN_INTERPRETER_DIR="${ZEPPELIN_HOME}/interpreter"
 fi
@@ -135,13 +139,12 @@ if [[ -n "${JAVA_HOME}" ]]; then
 else
   ZEPPELIN_RUNNER=java
 fi
-
 export ZEPPELIN_RUNNER
 
 if [[ -z "$ZEPPELIN_IDENT_STRING" ]]; then
   export ZEPPELIN_IDENT_STRING="${USER}"
 fi
 
-if [[ -z "$DEBUG" ]]; then
-  export DEBUG=0
+if [[ -z "$ZEPPELIN_INTERPRETER_REMOTE_RUNNER" ]]; then
+  export ZEPPELIN_INTERPRETER_REMOTE_RUNNER="bin/interpreter.sh"
 fi