commit b3983b10b2b8540acd2659fdd962622b1f294ab1
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Jun 12 14:21:09 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Mon Jun 16 10:35:14 2014 -0700
tree b7d906ad6467f34656aa5f1417a9015a2e782e9d
parent 2fa6ca4134bdbdfa9e13c4599d805708c3896b3e

BugFix: Check if ZK data dir is writable

- Fix for a bug, where
  ./onos.sh setup failed when ZK data dir already exists,
  but user did not have the write permission.

Change-Id: Ib0c303fdd5fc5e4d4eddaab80a95e3aa5fdbda9b

onos.sh

diff --git a/onos.sh b/onos.sh
index 8bbae2c..67c1070 100755
--- a/onos.sh
+++ b/onos.sh
@@ -254,11 +254,11 @@
   echo -n "Creating ${ZK_CONF} ... "
   
   # Create the ZooKeeper lib directory
-  if [ ! -d ${ZK_LIB_DIR} ]; then
+  if [[ ! ( -w ${ZK_LIB_DIR} && -d ${ZK_LIB_DIR} ) ]]; then
       local SUDO=${SUDO:-sudo}
       local whoami=`whoami`
       {
-          ${SUDO} mkdir ${ZK_LIB_DIR}
+          ${SUDO} mkdir -p ${ZK_LIB_DIR}
           ${SUDO} chown ${whoami} ${ZK_LIB_DIR}
       } || {
           echo "FAILED"