commit d8f30d934f1b5acf91216d87c1f99856859498f5
author Pavlin Radoslavov <pavlin@onlab.us> Fri Apr 18 13:03:09 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Fri Apr 18 16:19:56 2014 -0700
tree 5d51c7567c4f64a1e4a47a87de18a389841d41c2
parent 0487c719768a87e5ee575bc7a0054f4be36a4d8a

Conditionally create the ZooKeeper lib directory.

Also:
 * Update a log message to print the corresponding path and filename.
 * Update the "ZooKeeper" name: zookeeper and Zookeeper -> ZooKeeper
 * Update log messages: "export SUDO=sudo" -> "env SUDO=sudo"

Change-Id: Id8d9480e662d9203a5f0c0a9b52ddc854f3f5536

onos.sh

diff --git a/onos.sh b/onos.sh
index 51248d6..bb090e8 100755
--- a/onos.sh
+++ b/onos.sh
@@ -145,7 +145,7 @@
   local filename=`basename ${ONOS_CONF}`
   local usage="Usage: setup/start/stop ONOS on this server.
  \$ $0 setup [-f]
-    Set up ONOS node using ${filename}.
+    Set up ONOS node using ${ONOS_CONF} .
       - generate and replace config file of ZooKeeper.
       - create myid in ZooKeeper datadir.
       - generate and replace config file for Hazelcast.
@@ -240,8 +240,23 @@
 
 function create-zk-conf {
   echo -n "Creating ${ZK_CONF} ... "
-  
-  # creation of zookeeper config
+
+  # Create the ZooKeeper lib directory
+  if [ ! -d ${ZK_LIB_DIR} ]; then
+      local SUDO=${SUDO:-}
+      local whoami=`whoami`
+      {
+          ${SUDO} mkdir ${ZK_LIB_DIR}
+          ${SUDO} chown ${whoami} ${ZK_LIB_DIR}
+      } || {
+          echo "FAILED"
+          echo "[ERROR] Failed to create directory ${ZK_LIB_DIR}."
+          echo "[ERROR] Please retry after setting \"env SUDO=sudo\""
+          exit 1
+      }
+  fi
+
+  # creation of ZooKeeper config
   
   local temp_zk="${ZK_CONF}.tmp"
   if [ -f ${temp_zk} ]; then
@@ -279,7 +294,7 @@
     } || {
       echo "FAILED"
       echo "[ERROR] Failed to rename ${ZK_MY_ID}."
-      echo "[ERROR] Please retry after setting \"export SUDO=sudo\""
+      echo "[ERROR] Please retry after setting \"env SUDO=sudo\""
       exit 1
     }
   fi
@@ -467,12 +482,12 @@
 }
 
 function start-zk {
-  echo -n "Starting Zookeeper ... "
+  echo -n "Starting ZooKeeper ... "
   
   export ZOO_LOG_DIR=${ZK_LOG_DIR}
   mkdir -p ${ZK_LOG_DIR}
   if [ -f "${ZK_CONF}" ]; then
-    # Run Zookeeper with our configuration
+    # Run ZooKeeper with our configuration
     export ZOOCFG=${ZK_CONF_FILE}
     export ZOOCFGDIR=${ONOS_CONF_DIR}
   fi