diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2014-09-08 10:24:15 -0700 |
|---|---|---|
| committer | Andrew Or <andrewor14@gmail.com> | 2014-09-08 10:24:15 -0700 |
| commit | e16a8e7db5a3b1065b14baf89cb723a59b99226b (patch) | |
| tree | 09d5b9bd510325047aa20f62f215184e46367bdb /bin/spark-sql | |
| parent | 711356b422c66e2a80377a9f43fce97282460520 (diff) | |
| download | spark-e16a8e7db5a3b1065b14baf89cb723a59b99226b.tar.gz spark-e16a8e7db5a3b1065b14baf89cb723a59b99226b.tar.bz2 spark-e16a8e7db5a3b1065b14baf89cb723a59b99226b.zip | |
SPARK-3337 Paranoid quoting in shell to allow install dirs with spaces within.
...
Tested ! TBH, it isn't a great idea to have directory with spaces within. Because emacs doesn't like it then hadoop doesn't like it. and so on...
Author: Prashant Sharma <prashant.s@imaginea.com>
Closes #2229 from ScrapCodes/SPARK-3337/quoting-shell-scripts and squashes the following commits:
d4ad660 [Prashant Sharma] SPARK-3337 Paranoid quoting in shell to allow install dirs with spaces within.
Diffstat (limited to 'bin/spark-sql')
| -rwxr-xr-x | bin/spark-sql | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/spark-sql b/bin/spark-sql index 2a3cb31f58..ae096530ca 100755 --- a/bin/spark-sql +++ b/bin/spark-sql @@ -27,7 +27,7 @@ CLASS="org.apache.spark.sql.hive.thriftserver.SparkSQLCLIDriver" CLASS_NOT_FOUND_EXIT_STATUS=1 # Figure out where Spark is installed -FWDIR="$(cd `dirname $0`/..; pwd)" +FWDIR="$(cd "`dirname "$0"`"/..; pwd)" function usage { echo "Usage: ./bin/spark-sql [options] [cli option]" @@ -38,10 +38,10 @@ function usage { pattern+="\|--help" pattern+="\|=======" - $FWDIR/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2 + "$FWDIR"/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2 echo echo "CLI options:" - $FWDIR/bin/spark-class $CLASS --help 2>&1 | grep -v "$pattern" 1>&2 + "$FWDIR"/bin/spark-class $CLASS --help 2>&1 | grep -v "$pattern" 1>&2 } if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then @@ -49,7 +49,7 @@ if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then exit 0 fi -source $FWDIR/bin/utils.sh +source "$FWDIR"/bin/utils.sh SUBMIT_USAGE_FUNCTION=usage gatherSparkSubmitOpts "$@" |