From 2ce21b017690906764a3a6a732e1807b873e811c Mon Sep 17 00:00:00 2001
From: Jiaan Geng <beliefer@163.com>
Date: Tue, 17 Sep 2019 16:36:18 +0800
Subject: [PATCH] [CORE] Fix cannot find spark-xsql-shell. (#35)

**What changes were proposed in this pull request?**
This PR is related to https://github.com/Qihoo360/XSQL/pull/20.
The PR 20 replace prefix of artifactId from spark to xsql, but forgot to update `spark-xsql` and `spark-xsql-plugin-in`.
At finally, XSQL can't find the `spark-xsql-shell.jar`. Because we rename it as `xsql-shell.jar`
---
 bin/spark-xsql           | 4 ++--
 bin/spark-xsql-plugin-in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/spark-xsql b/bin/spark-xsql
index e5dc261..f8e41c2 100755
--- a/bin/spark-xsql
+++ b/bin/spark-xsql
@@ -11,7 +11,7 @@ DRIVER_MEM=5G
 
 # Export this as SPARK_HOME
 export SPARK_HOME="$FWDIR"
-SPARK_HIVE_SHELL_LIB="$SPARK_HOME/jars/$(cd ${SPARK_HOME}/jars; ls *spark-xsql-shell*)"
+SPARK_HIVE_SHELL_LIB="$SPARK_HOME/jars/$(cd ${SPARK_HOME}/jars; ls *xsql-shell*)"
 export SPARK_HIVE_MANCLASS_NAME="org.apache.spark.sql.xsql.shell.SparkXSQLShell"
 
 export SPARK_CLASSPATH=$DRIVER_CLASSPATH:$SPARK_CLASSPATH
@@ -178,4 +178,4 @@ fi
 
 #SPARK_CONFS=$SPARK_CONFS" --conf spark.dynamicAllocation.enabled=true "
 SPARK_CONFS=$SPARK_CONFS" --conf spark.app.fromshell=true "
-$SPARK_HOME/bin/spark-submit $SPARK_OPTS --class "$SPARK_HIVE_MANCLASS_NAME" $SPARK_CONFS  $SPARK_HIVE_SHELL_LIB
\ No newline at end of file
+$SPARK_HOME/bin/spark-submit $SPARK_OPTS --class "$SPARK_HIVE_MANCLASS_NAME" $SPARK_CONFS  $SPARK_HIVE_SHELL_LIB
diff --git a/bin/spark-xsql-plugin-in b/bin/spark-xsql-plugin-in
index fcaaded..8eace2e 100755
--- a/bin/spark-xsql-plugin-in
+++ b/bin/spark-xsql-plugin-in
@@ -11,7 +11,7 @@ DRIVER_MEM=5G
 
 # Export this as SPARK_HOME
 export SPARK_HOME="$FWDIR"
-SPARK_HIVE_SHELL_LIB="$SPARK_HOME/xsql-jars/$(cd ${SPARK_HOME}/xsql-jars; ls *spark-xsql-shell*)"
+SPARK_HIVE_SHELL_LIB="$SPARK_HOME/xsql-jars/$(cd ${SPARK_HOME}/xsql-jars; ls *xsql-shell*)"
 export SPARK_HIVE_MANCLASS_NAME="org.apache.spark.sql.xsql.shell.SparkXSQLShell"
 
 export SPARK_CLASSPATH=$DRIVER_CLASSPATH:$SPARK_CLASSPATH
@@ -254,4 +254,4 @@ if [ $LAUNCHER_EXIT_CODE != 0 ]; then
 fi
 
 CMD=("${CMD[@]:0:$LAST}")
-exec "${CMD[@]}"
\ No newline at end of file
+exec "${CMD[@]}"