Add lots of quotes.

Even to places that weren't really changes I made.

Author: Marcelo Vanzin

bin/spark-class

@@ -77,7 +77,7 @@ fi
 CMD=()
 while IFS= read -d '' -r ARG; do
   CMD+=("$ARG")
-done < <($RUNNER -cp "$SPARK_LAUNCHER_CP" org.apache.spark.launcher.Main "$@")
+done < <("$RUNNER" -cp "$SPARK_LAUNCHER_CP" org.apache.spark.launcher.Main "$@")
 
 if [ "${CMD[0]}" = "usage" ]; then
   "${CMD[@]}"

bin/spark-shell

@@ -32,11 +32,11 @@ export FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
 
 usage() {
   if [ -n "$1" ]; then
-    echo $1
+    echo "$1"
   fi
   echo "Usage: ./bin/spark-shell [options]"
   "$FWDIR"/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
-  exit $2
+  exit "$2"
 }
 export -f usage
 

bin/spark-sql

@@ -32,7 +32,7 @@ export FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
 
 function usage {
   if [ -n "$1" ]; then
-    echo $1
+    echo "$1"
   fi
   echo "Usage: ./bin/spark-sql [options] [cli option]"
   pattern="usage"
@@ -45,13 +45,13 @@ function usage {
   "$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
-  exit $2
+  "$FWDIR"/bin/spark-class "$CLASS" --help 2>&1 | grep -v "$pattern" 1>&2
+  exit "$2"
 }
 export -f usage
 
 if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then
   usage "" 0
 fi
 
-exec "$FWDIR"/bin/spark-submit --class $CLASS "$@"
+exec "$FWDIR"/bin/spark-submit --class "$CLASS" "$@"

bin/spark-submit

@@ -23,10 +23,10 @@ SPARK_HOME="$(cd "`dirname "$0"`"/..; pwd)"
 if ! type -t usage >/dev/null 2>&1; then
   usage() {
     if [ -n "$1" ]; then
-      echo $1
+      echo "$1"
     fi
     "$SPARK_HOME"/bin/spark-class org.apache.spark.deploy.SparkSubmit --help
-    exit $2
+    exit "$2"
   }
   export -f usage
 fi

sbin/spark-daemon.sh

@@ -122,12 +122,12 @@ if [ "$SPARK_NICENESS" = "" ]; then
 fi
 
 run_command() {
-  mode=$1
+  mode="$1"
   shift
 
   mkdir -p "$SPARK_PID_DIR"
 
-  if [ -f $pid ]; then
+  if [ -f "$pid" ]; then
     TARGET_ID="$(cat "$pid")"
     if [[ $(ps -p "$TARGET_ID" -o args=) =~ $command ]]; then
       echo "$command running as process $TARGET_ID.  Stop it first."
@@ -137,21 +137,21 @@ run_command() {
 
   if [ "$SPARK_MASTER" != "" ]; then
     echo rsync from "$SPARK_MASTER"
-    rsync -a -e ssh --delete --exclude=.svn --exclude='logs/*' --exclude='contrib/hod/logs/*' $SPARK_MASTER/ "$SPARK_HOME"
+    rsync -a -e ssh --delete --exclude=.svn --exclude='logs/*' --exclude='contrib/hod/logs/*' "$SPARK_MASTER/" "$SPARK_HOME"
   fi
 
   spark_rotate_log "$log"
   echo "starting $command, logging to $log"
 
-  case $mode in
+  case "$mode" in
     (class)
-      nohup nice -n $SPARK_NICENESS "$SPARK_PREFIX"/bin/spark-class $command "$@" >> "$log" 2>&1 < /dev/null &
-      newpid=$!
+      nohup nice -n "$SPARK_NICENESS" "$SPARK_PREFIX"/bin/spark-class $command "$@" >> "$log" 2>&1 < /dev/null &
+      newpid="$!"
       ;;
 
     (submit)
-      nohup nice -n $SPARK_NICENESS "$SPARK_PREFIX"/bin/spark-submit --class $command "$@" >> "$log" 2>&1 < /dev/null &
-      newpid=$!
+      nohup nice -n "$SPARK_NICENESS" "$SPARK_PREFIX"/bin/spark-submit --class $command "$@" >> "$log" 2>&1 < /dev/null &
+      newpid="$!"
       ;;
 
     (*)
@@ -160,7 +160,7 @@ run_command() {
       ;;
   esac
 
-  echo $newpid > $pid
+  echo "$newpid" > "$pid"
   sleep 2
   # Check if the process has died; in that case we'll tail the log so the user can see
   if [[ ! $(ps -p "$newpid" -o args=) =~ $command ]]; then