Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 129691880F for ; Mon, 8 Jun 2015 14:42:35 +0000 (UTC) Received: (qmail 56813 invoked by uid 500); 8 Jun 2015 14:35:12 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 56658 invoked by uid 500); 8 Jun 2015 14:35:12 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 56407 invoked by uid 99); 8 Jun 2015 14:35:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jun 2015 14:35:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 63811DFF67; Mon, 8 Jun 2015 14:35:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Mon, 08 Jun 2015 14:35:15 -0000 Message-Id: <990e0624b8ac4d90afc5e041a762430e@git.apache.org> In-Reply-To: <0b208c4273cc4e6a8e58446afaa9e90a@git.apache.org> References: <0b208c4273cc4e6a8e58446afaa9e90a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/10] cassandra git commit: Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529 Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8ceb2c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8ceb2c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8ceb2c6 Branch: refs/heads/trunk Commit: a8ceb2c6503bda43fad7a2669bc2c92a2b28e46d Parents: b0dbea3 Author: Stefania Alborghetti Authored: Tue Jun 2 08:07:07 2015 +0200 Committer: Jonathan Ellis Committed: Mon Jun 8 09:29:10 2015 -0500 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/cassandra ---------------------------------------------------------------------- diff --git a/bin/cassandra b/bin/cassandra index 09fe013..d2f8ce7 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; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/sstablesplit ---------------------------------------------------------------------- diff --git a/bin/sstablesplit b/bin/sstablesplit index 15f0a04..43ad189 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 "$@" http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/sstableupgrade ---------------------------------------------------------------------- diff --git a/bin/sstableupgrade b/bin/sstableupgrade index dc72aec..111fda6 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 "$@" http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/client_only/bin/client_only ---------------------------------------------------------------------- diff --git a/examples/client_only/bin/client_only b/examples/client_only/bin/client_only index af2a623..99487cc 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 $@ http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/bin/word_count b/examples/hadoop_cql3_word_count/bin/word_count index 974a39a..76cca7d 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count_counters ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/bin/word_count_counters b/examples/hadoop_cql3_word_count/bin/word_count_counters index 0b69b40..0da5e1a 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count_setup ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/bin/word_count_setup b/examples/hadoop_cql3_word_count/bin/word_count_setup index d194a45..6e5650f 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count ---------------------------------------------------------------------- diff --git a/examples/hadoop_word_count/bin/word_count b/examples/hadoop_word_count/bin/word_count index a0c5aa0..34534d7 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count_counters ---------------------------------------------------------------------- diff --git a/examples/hadoop_word_count/bin/word_count_counters b/examples/hadoop_word_count/bin/word_count_counters index 7793477..aaf40b8 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count_setup ---------------------------------------------------------------------- diff --git a/examples/hadoop_word_count/bin/word_count_setup b/examples/hadoop_word_count/bin/word_count_setup index d194a45..6e5650f 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/cassandra-stress ---------------------------------------------------------------------- diff --git a/tools/bin/cassandra-stress b/tools/bin/cassandra-stress index 39257cd..57d2d64 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 $@ http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/cassandra-stressd ---------------------------------------------------------------------- diff --git a/tools/bin/cassandra-stressd b/tools/bin/cassandra-stressd index 8d337e5..6b8e165 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." ;; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/sstablelevelreset ---------------------------------------------------------------------- diff --git a/tools/bin/sstablelevelreset b/tools/bin/sstablelevelreset index a6fb33b..a4a4e5d 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 "$@" http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/sstablemetadata ---------------------------------------------------------------------- diff --git a/tools/bin/sstablemetadata b/tools/bin/sstablemetadata index 5e7c26a..6aeacfe 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 "$@" http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/sstableofflinerelevel ---------------------------------------------------------------------- diff --git a/tools/bin/sstableofflinerelevel b/tools/bin/sstableofflinerelevel index 19cb4c1..0d3fc04 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 "$@"