incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1231200 - in /incubator/accumulo/branches/1.4: bin/accumulo conf/accumulo-env.sh.example
Date Fri, 13 Jan 2012 17:32:02 GMT
Author: vines
Date: Fri Jan 13 17:32:02 2012
New Revision: 1231200

URL: http://svn.apache.org/viewvc?rev=1231200&view=rev
Log:
ACCUMULO-252 - more clarity in what users need to set

Modified:
    incubator/accumulo/branches/1.4/bin/accumulo
    incubator/accumulo/branches/1.4/conf/accumulo-env.sh.example

Modified: incubator/accumulo/branches/1.4/bin/accumulo
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/bin/accumulo?rev=1231200&r1=1231199&r2=1231200&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/bin/accumulo (original)
+++ incubator/accumulo/branches/1.4/bin/accumulo Fri Jan 13 17:32:02 2012
@@ -84,18 +84,25 @@ fi
 XML_FILES=${ACCUMULO_HOME}/conf
 CLASSPATH=${XML_FILES}:${START_JAR}:${COMMONS_JCI_JARS}
 
-if [ -z $JAVA_HOME ] ; then
+if [ -z $JAVA_HOME ] || [ ! -d $JAVA_HOME ]; then
     echo "JAVA_HOME is not set.  Please make sure it's set globally or in conf/accumulo-env.sh"
     exit 1
 fi
-if [ -z $HADOOP_HOME ] ; then
+if [ -z $HADOOP_HOME ] || [ ! -d $HADOOP_HOME ]; then
     echo "HADOOP_HOME 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 ] || [ ! -d $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
+
+#Export the variables just in case they are not exported
+#This makes them available to java
+export JAVA_HOME=$JAVA_HOME
+export HADOOP_HOME=$HADOOP_HOME
+export ZOOKEEPER_HOME=$ZOOKEEPER_HOME
+
 JAVA=$JAVA_HOME/bin/java
 PLATFORM="`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`"
 

Modified: incubator/accumulo/branches/1.4/conf/accumulo-env.sh.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/conf/accumulo-env.sh.example?rev=1231200&r1=1231199&r2=1231200&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/conf/accumulo-env.sh.example (original)
+++ incubator/accumulo/branches/1.4/conf/accumulo-env.sh.example Fri Jan 13 17:32:02 2012
@@ -28,10 +28,10 @@
 ### on a single machine.
 ###
 
-test -z "$JAVA_HOME"             && export JAVA_HOME=$JAVA_HOME
-test -z "$HADOOP_HOME"           && export HADOOP_HOME=$HADOOP_LOCATION
+test -z "$JAVA_HOME"             && export JAVA_HOME=/path/to/java
+test -z "$HADOOP_HOME"           && export HADOOP_HOME=/path/to/hadoop
+test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME=/path/to/zookeeper
 test -z "$ACCUMULO_LOG_DIR"      && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
-test -z "$ZOOKEEPER_HOME"        && export ZOOKEEPER_HOME="$ZOOKEEPER_HOME"
 if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
 then
    POLICY="-Djava.security.manager -Djava.security.policy=${ACCUMULO_HOME}/conf/accumulo.policy"



Mime
View raw message