From a8ceb2c6503bda43fad7a2669bc2c92a2b28e46d Mon Sep 17 00:00:00 2001
From: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Date: Tue, 2 Jun 2015 08:07:07 +0200
Subject: [PATCH] Added quotes to CLASSPATH and JAVA for nix scripts,
 CASSANDRA-9529

---
 bin/cassandra                                           | 2 +-
 bin/sstablesplit                                        | 4 ++--
 bin/sstableupgrade                                      | 4 ++--
 examples/client_only/bin/client_only                    | 2 +-
 examples/hadoop_cql3_word_count/bin/word_count          | 2 +-
 examples/hadoop_cql3_word_count/bin/word_count_counters | 2 +-
 examples/hadoop_cql3_word_count/bin/word_count_setup    | 2 +-
 examples/hadoop_word_count/bin/word_count               | 2 +-
 examples/hadoop_word_count/bin/word_count_counters      | 2 +-
 examples/hadoop_word_count/bin/word_count_setup         | 2 +-
 tools/bin/cassandra-stress                              | 2 +-
 tools/bin/cassandra-stressd                             | 2 +-
 tools/bin/sstablelevelreset                             | 4 ++--
 tools/bin/sstablemetadata                               | 2 +-
 tools/bin/sstableofflinerelevel                         | 4 ++--
 15 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bin/cassandra b/bin/cassandra
index 09fe013c0a..d2f8ce7503 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -207,7 +207,7 @@ while true; do
 done
 
 # see CASSANDRA-7254
-"$JAVA" -cp $CLASSPATH $JVM_OPTS 2>&1 | grep -q 'Error: Exception thrown by the agent : java.lang.NullPointerException'
+"$JAVA" -cp "$CLASSPATH" $JVM_OPTS 2>&1 | grep -q 'Error: Exception thrown by the agent : java.lang.NullPointerException'
 if [ $? -ne "1" ]; then 
     echo Unable to bind JMX, is Cassandra already running?
     exit 1;
diff --git a/bin/sstablesplit b/bin/sstablesplit
index 15f0a0461f..43ad189d81 100755
--- a/bin/sstablesplit
+++ b/bin/sstablesplit
@@ -38,12 +38,12 @@ else
     JAVA=`which java`
 fi
 
-if [ -z $CLASSPATH ]; then
+if [ -z "$CLASSPATH" ]; then
     echo "You must set the CLASSPATH var" >&2
     exit 1
 fi
 
-$JAVA $JAVA_AGENT -ea -cp $CLASSPATH $JVM_OPTS -Xmx256M \
+"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx256M \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.StandaloneSplitter "$@"
 
diff --git a/bin/sstableupgrade b/bin/sstableupgrade
index dc72aec07c..111fda6c4d 100755
--- a/bin/sstableupgrade
+++ b/bin/sstableupgrade
@@ -38,7 +38,7 @@ else
     JAVA=`which java`
 fi
 
-if [ -z $CLASSPATH ]; then
+if [ -z "$CLASSPATH" ]; then
     echo "You must set the CLASSPATH var" >&2
     exit 1
 fi
@@ -47,7 +47,7 @@ if [ "x$MAX_HEAP_SIZE" = "x" ]; then
     MAX_HEAP_SIZE="256M"
 fi
 
-$JAVA $JAVA_AGENT -ea -cp $CLASSPATH $JVM_OPTS -Xmx$MAX_HEAP_SIZE \
+"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx$MAX_HEAP_SIZE \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.StandaloneUpgrader "$@"
 
diff --git a/examples/client_only/bin/client_only b/examples/client_only/bin/client_only
index af2a62312d..99487cc9d1 100755
--- a/examples/client_only/bin/client_only
+++ b/examples/client_only/bin/client_only
@@ -53,4 +53,4 @@ if [ "x$JAVA" = "x" ]; then
 fi
 
 #echo $CLASSPATH
-$JAVA -Xmx1G -ea -cp $CLASSPATH ClientOnlyExample $@
+"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" ClientOnlyExample $@
diff --git a/examples/hadoop_cql3_word_count/bin/word_count b/examples/hadoop_cql3_word_count/bin/word_count
index 974a39aed3..76cca7da53 100755
--- a/examples/hadoop_cql3_word_count/bin/word_count
+++ b/examples/hadoop_cql3_word_count/bin/word_count
@@ -59,4 +59,4 @@ OUTPUT_REDUCER=cassandra
 INPUT_MAPPER=native
 
 #echo $CLASSPATH
-$JAVA -Xmx1G -ea -cp $CLASSPATH WordCount output_reducer=$OUTPUT_REDUCER input_mapper=$INPUT_MAPPER
+"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" WordCount output_reducer=$OUTPUT_REDUCER input_mapper=$INPUT_MAPPER
diff --git a/examples/hadoop_cql3_word_count/bin/word_count_counters b/examples/hadoop_cql3_word_count/bin/word_count_counters
index 0b69b407c8..0da5e1a1c4 100755
--- a/examples/hadoop_cql3_word_count/bin/word_count_counters
+++ b/examples/hadoop_cql3_word_count/bin/word_count_counters
@@ -57,4 +57,4 @@ fi
 INPUT_MAPPER=native
 
 #echo $CLASSPATH
-$JAVA -Xmx1G -ea -cp $CLASSPATH WordCountCounters input_mapper=$INPUT_MAPPER
+"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" WordCountCounters input_mapper=$INPUT_MAPPER
diff --git a/examples/hadoop_cql3_word_count/bin/word_count_setup b/examples/hadoop_cql3_word_count/bin/word_count_setup
index d194a452b4..6e5650fd85 100755
--- a/examples/hadoop_cql3_word_count/bin/word_count_setup
+++ b/examples/hadoop_cql3_word_count/bin/word_count_setup
@@ -58,4 +58,4 @@ HOST=localhost
 PORT=9160
 FRAMED=true
 
-$JAVA -Xmx1G -ea -Dcassandra.host=$HOST -Dcassandra.port=$PORT -Dcassandra.framed=$FRAMED -cp $CLASSPATH WordCountSetup
+"$JAVA" -Xmx1G -ea -Dcassandra.host=$HOST -Dcassandra.port=$PORT -Dcassandra.framed=$FRAMED -cp "$CLASSPATH" WordCountSetup
diff --git a/examples/hadoop_word_count/bin/word_count b/examples/hadoop_word_count/bin/word_count
index a0c5aa02f1..34534d7221 100755
--- a/examples/hadoop_word_count/bin/word_count
+++ b/examples/hadoop_word_count/bin/word_count
@@ -58,4 +58,4 @@ fi
 OUTPUT_REDUCER=cassandra
 
 #echo $CLASSPATH
-$JAVA -Xmx1G -ea -cp $CLASSPATH WordCount output_reducer=$OUTPUT_REDUCER
+"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" WordCount output_reducer=$OUTPUT_REDUCER
diff --git a/examples/hadoop_word_count/bin/word_count_counters b/examples/hadoop_word_count/bin/word_count_counters
index 779347743f..aaf40b8603 100755
--- a/examples/hadoop_word_count/bin/word_count_counters
+++ b/examples/hadoop_word_count/bin/word_count_counters
@@ -55,4 +55,4 @@ if [ "x$JAVA" = "x" ]; then
 fi
 
 #echo $CLASSPATH
-$JAVA -Xmx1G -ea -cp $CLASSPATH WordCountCounters
+"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" WordCountCounters
diff --git a/examples/hadoop_word_count/bin/word_count_setup b/examples/hadoop_word_count/bin/word_count_setup
index d194a452b4..6e5650fd85 100755
--- a/examples/hadoop_word_count/bin/word_count_setup
+++ b/examples/hadoop_word_count/bin/word_count_setup
@@ -58,4 +58,4 @@ HOST=localhost
 PORT=9160
 FRAMED=true
 
-$JAVA -Xmx1G -ea -Dcassandra.host=$HOST -Dcassandra.port=$PORT -Dcassandra.framed=$FRAMED -cp $CLASSPATH WordCountSetup
+"$JAVA" -Xmx1G -ea -Dcassandra.host=$HOST -Dcassandra.port=$PORT -Dcassandra.framed=$FRAMED -cp "$CLASSPATH" WordCountSetup
diff --git a/tools/bin/cassandra-stress b/tools/bin/cassandra-stress
index 39257cd53f..57d2d6457f 100755
--- a/tools/bin/cassandra-stress
+++ b/tools/bin/cassandra-stress
@@ -42,4 +42,4 @@ if [ "x$JAVA" = "x" ]; then
     exit 1
 fi
 
-$JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.Stress $@
+"$JAVA" -server -cp "$CLASSPATH" org.apache.cassandra.stress.Stress $@
diff --git a/tools/bin/cassandra-stressd b/tools/bin/cassandra-stressd
index 8d337e5411..6b8e165f8f 100755
--- a/tools/bin/cassandra-stressd
+++ b/tools/bin/cassandra-stressd
@@ -50,7 +50,7 @@ fi
 case "$1" in
   start)
     echo "Starting $DESC: "
-    $JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.StressServer $@ 1> ./stressd.out.log 2> ./stressd.err.log &
+    "$JAVA" -server -cp "$CLASSPATH" org.apache.cassandra.stress.StressServer $@ 1> ./stressd.out.log 2> ./stressd.err.log &
     echo $! > ./stressd.pid
     echo "done."
   ;;
diff --git a/tools/bin/sstablelevelreset b/tools/bin/sstablelevelreset
index a6fb33b1be..a4a4e5da75 100755
--- a/tools/bin/sstablelevelreset
+++ b/tools/bin/sstablelevelreset
@@ -39,11 +39,11 @@ else
     JAVA=`which java`
 fi
 
-if [ -z $CLASSPATH ]; then
+if [ -z "$CLASSPATH" ]; then
     echo "You must set the CLASSPATH var" >&2
     exit 1
 fi
 
-$JAVA -cp $CLASSPATH  -Dstorage-config=$CASSANDRA_CONF \
+"$JAVA" -cp "$CLASSPATH"  -Dstorage-config=$CASSANDRA_CONF \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.SSTableLevelResetter "$@"
diff --git a/tools/bin/sstablemetadata b/tools/bin/sstablemetadata
index 5e7c26a395..6aeacfe86d 100755
--- a/tools/bin/sstablemetadata
+++ b/tools/bin/sstablemetadata
@@ -44,6 +44,6 @@ if [ -z "$CLASSPATH" ]; then
     exit 1
 fi
 
-$JAVA -cp $CLASSPATH \
+"$JAVA" -cp "$CLASSPATH" \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.SSTableMetadataViewer "$@"
diff --git a/tools/bin/sstableofflinerelevel b/tools/bin/sstableofflinerelevel
index 19cb4c1091..0d3fc04d0f 100755
--- a/tools/bin/sstableofflinerelevel
+++ b/tools/bin/sstableofflinerelevel
@@ -39,11 +39,11 @@ else
     JAVA=`which java`
 fi
 
-if [ -z $CLASSPATH ]; then
+if [ -z "$CLASSPATH" ]; then
     echo "You must set the CLASSPATH var" >&2
     exit 1
 fi
 
-$JAVA -cp $CLASSPATH  -Dstorage-config=$CASSANDRA_CONF \
+"$JAVA" -cp "$CLASSPATH"  -Dstorage-config=$CASSANDRA_CONF \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.SSTableOfflineRelevel "$@"