Support for JAVA_HOME and java opts via -D*.

dstreev · Sep 24, 2020 · 01d329e · 01d329e
1 parent 55345d8
commit 01d329e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/hive-sre/bin/hive-sre b/hive-sre/bin/hive-sre
@@ -12,6 +12,11 @@ if [[ ! -d ${HOME}/.hive-sre/cust ]]; then
   mkdir -p ${HOME}/.hive-sre/cust
 fi
 
+if [ ! -z ${JAVA_HOME} ]; then
+  JAVA="${JAVA_HOME}/bin/java"
+else
+  JAVA=java
+fi
 
 if [[ -f ./hive-sre && "${APP_DIR}" != "${CURR_DIR}" && "${APP_DIR}" != "." ]]; then
   echo "Appears you are referencing a previously installed 'hive-sre' while "
@@ -112,7 +117,8 @@ if [[ "${PRG_ARGS}x" != "x" ]]; then
     echo "PRG_ARGS=${PRG_ARGS}"
 fi
 
+$(${JAVA} -version)
 
-CLI_CMD="${CLI_CMD}java -cp ${CMD_CP} ${APP_JAVA_OPTS} com.streever.hive.Sre ${PRG_ARGS}"
+CLI_CMD="${JAVA} -cp ${CMD_CP} ${APP_JAVA_OPTS} com.streever.hive.Sre ${PRG_ARGS}"
 
 eval "${CLI_CMD}"
diff --git a/hive-sre/bin/hive-sre-cli b/hive-sre/bin/hive-sre-cli
@@ -14,6 +14,12 @@ fi
 PRG_ARGS=
 CMD_CP=
 
+if [ ! -z ${JAVA_HOME} ]; then
+  JAVA="${JAVA_HOME}/bin/java"
+else
+  JAVA=java
+fi
+
 if [[ -f ./hive-sre-shaded.jar ]]; then
     # Look in Current Directory
     CMD_CP=$APP_DIR/hive-sre-shaded.jar
@@ -37,7 +43,6 @@ fi
 export HADOOP_CONF_DIR="/etc/hadoop/conf"
 
 AUX_LIBS_DIR=${HADOOP_CLI_AUX_LIBS:-${HOME}/.hive-sre/aux_libs}
-
 SHOW_CP=
 CMD_DIRECTIVE=
 CMD_ARGS=
@@ -162,6 +167,8 @@ if [[ "${PRG_ARGS}x" != "x" ]]; then
     echo "PRG_ARGS=${PRG_ARGS}"
 fi
 
-CLI_CMD="${CLI_CMD}java -cp ${CMD_CP} ${APP_JAVA_OPTS} com.streever.hadoop.HadoopShell ${PRG_ARGS}"
+$(${JAVA} -version)
+
+CLI_CMD="${JAVA} -cp ${CMD_CP} ${APP_JAVA_OPTS} com.streever.hadoop.HadoopShell ${PRG_ARGS}"
 
 eval "${CLI_CMD}"
diff --git a/hive-sre/pom.xml b/hive-sre/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.streever.hive</groupId>
     <artifactId>hive-sre</artifactId>
-    <version>2.3.2.3-SNAPSHOT</version>
+    <version>2.3.2.4-SNAPSHOT</version>
 
     <name>hive</name>
 
@@ -55,7 +55,7 @@
         <!--        <hadoop.major>3.1</hadoop.major>-->
         <!--        <hive.version>3.1.1</hive.version>-->
 
-        <hadoop-cli.version>2.2.2.0-SNAPSHOT</hadoop-cli.version>
+        <hadoop-cli.version>2.2.2.1-SNAPSHOT</hadoop-cli.version>
 
     </properties>