Fixed minor issues in spark-sql and start-thriftserver.sh

xiliu82 · Jul 24, 2014 · b8905ba · b8905ba
1 parent f975d22
commit b8905ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/bin/spark-sql b/bin/spark-sql
@@ -30,6 +30,12 @@ set -o posix
 # Figure out where Spark is installed
 FWDIR="$(cd `dirname $0`/..; pwd)"
 
+if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then
+  echo "Usage: ./sbin/spark-sql [options]"
+  $FWDIR/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
+  exit 0
+fi
+
 ASSEMBLY_DIR="$FWDIR/assembly/target/scala-$SCALA_VERSION"
 
 if [ -n "$JAVA_HOME" ]; then

diff --git a/sbin/start-thriftserver.sh b/sbin/start-thriftserver.sh
@@ -30,9 +30,6 @@ esac
 # Enter posix mode for bash
 set -o posix
 
-## Global script variables
-FWDIR="$(cd `dirname $0`/..; pwd)"
-
 if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then
   echo "Usage: ./sbin/start-thriftserver [options]"
   $FWDIR/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2