accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1442363 - in /accumulo/trunk/bin: config.sh generate_monitor_certificate.sh start-all.sh start-here.sh stop-all.sh tool.sh
Date Mon, 04 Feb 2013 21:12:56 GMT
Author: vines
Date: Mon Feb  4 21:12:56 2013
New Revision: 1442363

URL: http://svn.apache.org/viewvc?rev=1442363&view=rev
Log:
ACCUMULO-1035 - more quoting


Modified:
    accumulo/trunk/bin/config.sh
    accumulo/trunk/bin/generate_monitor_certificate.sh
    accumulo/trunk/bin/start-all.sh
    accumulo/trunk/bin/start-here.sh
    accumulo/trunk/bin/stop-all.sh
    accumulo/trunk/bin/tool.sh

Modified: accumulo/trunk/bin/config.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/config.sh?rev=1442363&r1=1442362&r2=1442363&view=diff
==============================================================================
--- accumulo/trunk/bin/config.sh (original)
+++ accumulo/trunk/bin/config.sh Mon Feb  4 21:12:56 2013
@@ -45,7 +45,7 @@ mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null
 
 export ACCUMULO_LOG_DIR
 
-if [ -z ${ACCUMULO_VERSION} ]; then
+if [ -z "${ACCUMULO_VERSION}" ]; then
         ACCUMULO_VERSION=1.5.0-SNAPSHOT
 fi
 

Modified: accumulo/trunk/bin/generate_monitor_certificate.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/generate_monitor_certificate.sh?rev=1442363&r1=1442362&r2=1442363&view=diff
==============================================================================
--- accumulo/trunk/bin/generate_monitor_certificate.sh (original)
+++ accumulo/trunk/bin/generate_monitor_certificate.sh Mon Feb  4 21:12:56 2013
@@ -27,25 +27,25 @@ KEYSTOREPATH="$ACCUMULO_HOME/conf/keysto
 TRUSTSTOREPATH="$ACCUMULO_HOME/conf/cacerts.jks"
 CERTPATH="$ACCUMULO_HOME/conf/server.cer"
 
-if [ -e $KEYSTOREPATH ] ; then
+if [ -e "$KEYSTOREPATH" ] ; then
   rm -i $KEYSTOREPATH
-  if [ -e $KEYSTOREPATH ] ; then
+  if [ -e "$KEYSTOREPATH" ] ; then
     echo "keystore already exists, exiting"
     exit 1
   fi
 fi
 
-if [ -e $TRUSTSTOREPATH ] ; then
+if [ -e "$TRUSTSTOREPATH" ] ; then
   rm -i $TRUSTSTOREPATH
-  if [ -e $TRUSTSTOREPATH ] ; then
+  if [ -e "$TRUSTSTOREPATH" ] ; then
     echo "truststore already exists, exiting"
     exit 2
   fi
 fi
 
-if [ -e $CERTPATH ] ; then
+if [ -e "$CERTPATH" ] ; then
   rm -i $CERTPATH
-  if [ -e $CERTPATH ] ; then
+  if [ -e "$CERTPATH" ] ; then
     echo "cert already exists, exiting"
     exit 3
   fi

Modified: accumulo/trunk/bin/start-all.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/start-all.sh?rev=1442363&r1=1442362&r2=1442363&view=diff
==============================================================================
--- accumulo/trunk/bin/start-all.sh (original)
+++ accumulo/trunk/bin/start-all.sh Mon Feb  4 21:12:56 2013
@@ -29,7 +29,7 @@ if [ ! -f $ACCUMULO_HOME/conf/accumulo-e
 fi
 
 
-if [ -z $ZOOKEEPER_HOME ] ; then
+if [ -z "$ZOOKEEPER_HOME" ] ; then
     echo "ZOOKEEPER_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
     exit 1
 fi

Modified: accumulo/trunk/bin/start-here.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/start-here.sh?rev=1442363&r1=1442362&r2=1442363&view=diff
==============================================================================
--- accumulo/trunk/bin/start-here.sh (original)
+++ accumulo/trunk/bin/start-here.sh Mon Feb  4 21:12:56 2013
@@ -57,7 +57,7 @@ done
 
 for host in $HOSTS
 do
-    if [ ${host} = ${GC} ]
+    if [ ${host} = "${GC}" ]
     then
 	${bin}/start-server.sh $GC gc "garbage collector"
 	break
@@ -66,7 +66,7 @@ done
 
 for host in $HOSTS
 do
-    if [ ${host} = ${MONITOR} ]
+    if [ ${host} = "${MONITOR}" ]
     then
 	${bin}/start-server.sh $MONITOR monitor 
 	break

Modified: accumulo/trunk/bin/stop-all.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/stop-all.sh?rev=1442363&r1=1442362&r2=1442363&view=diff
==============================================================================
--- accumulo/trunk/bin/stop-all.sh (original)
+++ accumulo/trunk/bin/stop-all.sh Mon Feb  4 21:12:56 2013
@@ -42,9 +42,9 @@ do
       ${bin}/stop-server.sh $master "$ACCUMULO_HOME/.*/accumulo-start.*.jar" master $signal
    done
 
-   ${bin}/stop-server.sh $GC "$ACCUMULO_HOME/.*/accumulo-start.*.jar" gc $signal
+   ${bin}/stop-server.sh "$GC" "$ACCUMULO_HOME/.*/accumulo-start.*.jar" gc $signal
 
-   ${bin}/stop-server.sh $MONITOR "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
+   ${bin}/stop-server.sh "$MONITOR" "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
 
    for tracer in `grep -v '^#' "$ACCUMULO_HOME/conf/tracers"`
    do

Modified: accumulo/trunk/bin/tool.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/tool.sh?rev=1442363&r1=1442362&r2=1442363&view=diff
==============================================================================
--- accumulo/trunk/bin/tool.sh (original)
+++ accumulo/trunk/bin/tool.sh Mon Feb  4 21:12:56 2013
@@ -20,11 +20,11 @@ bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 . "$bin"/config.sh
 
-if [ -z $HADOOP_PREFIX ] ; then
+if [ -z "$HADOOP_PREFIX" ] ; then
     echo "HADOOP_PREFIX is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
     exit 1
 fi
-if [ -z $ZOOKEEPER_HOME ] ; then
+if [ -z "$ZOOKEEPER_HOME" ] ; then
     echo "ZOOKEEPER_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
     exit 1
 fi



Mime
View raw message