From 2c5a532606d204e9e85874052e7a2ac21d9fd554 Mon Sep 17 00:00:00 2001
From: ronniedada <ronniedada@gmail.com>
Date: Thu, 25 Jul 2013 15:01:55 -0700
Subject: [PATCH] revised shell command

---
 cookbooks/couchbase/recipes/setup-2.1.0.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cookbooks/couchbase/recipes/setup-2.1.0.rb b/cookbooks/couchbase/recipes/setup-2.1.0.rb
index ed9b610c5..8d03082c0 100644
--- a/cookbooks/couchbase/recipes/setup-2.1.0.rb
+++ b/cookbooks/couchbase/recipes/setup-2.1.0.rb
@@ -146,14 +146,14 @@
           log("clustering - rs_tag private_ip res: #{private_ips}")
           if private_ips.length >= 1
 
-            cmd = "sleep 30 && /opt/couchbase/bin/couchbase-cli server-add" +
+            add = "sleep 30 && /opt/couchbase/bin/couchbase-cli server-add" +
               " -c #{private_ips[0]}" +
               " -u #{username}" +
               " -p #{password}" +
               " --server-add=#{ip}" +
               " --server-add-username=#{username}" +
               " --server-add-password=#{password} 2>\&1"
-              cmd = "for i in {1..5}; do x=`$cmd`; if [ $x -eq 0 ]; then break; else echo 'retrying ...'$i; fi; done"
+              cmd = "for i in {1..5}; do x=\`#{add}\`; if [[ -z "$x" ]]; then break; else sleep 30 && echo 'retrying...'$i; fi; done"
               begin
                 log("clustering - server-add cmd: #{cmd}")
                 execute "clustering - server-add cmd: #{cmd}" do