From 95c137158f56f7f7d07cc29703504b81b8c97c12 Mon Sep 17 00:00:00 2001 From: Justin Starry Date: Tue, 19 Nov 2019 20:49:25 -0500 Subject: [PATCH] Fix gce.sh info (#7054) automerge --- net/gce.sh | 90 +++++++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 41 deletions(-) diff --git a/net/gce.sh b/net/gce.sh index 138ea02ec..e76c09989 100755 --- a/net/gce.sh +++ b/net/gce.sh @@ -891,50 +891,58 @@ info) fi nodeType=bootstrap-leader - for i in $(seq 0 $(( ${#validatorIpList[@]} - 1)) ); do - ipAddress=${validatorIpList[$i]} - ipAddressPrivate=${validatorIpListPrivate[$i]} - zone=${validatorIpListZone[$i]} - if $evalInfo; then - echo "NET_VALIDATOR${i}_IP=$ipAddress" - else - printNode $nodeType "$ipAddress" "$ipAddressPrivate" "$zone" - fi - nodeType=validator - done + if [[ ${#validatorIpList[@]} -gt 0 ]]; then + for i in $(seq 0 $(( ${#validatorIpList[@]} - 1)) ); do + ipAddress=${validatorIpList[$i]} + ipAddressPrivate=${validatorIpListPrivate[$i]} + zone=${validatorIpListZone[$i]} + if $evalInfo; then + echo "NET_VALIDATOR${i}_IP=$ipAddress" + else + printNode $nodeType "$ipAddress" "$ipAddressPrivate" "$zone" + fi + nodeType=validator + done + fi - for i in $(seq 0 $(( ${#clientIpList[@]} - 1)) ); do - ipAddress=${clientIpList[$i]} - ipAddressPrivate=${clientIpListPrivate[$i]} - zone=${clientIpListZone[$i]} - if $evalInfo; then - echo "NET_CLIENT${i}_IP=$ipAddress" - else - printNode client "$ipAddress" "$ipAddressPrivate" "$zone" - fi - done + if [[ ${#clientIpList[@]} -gt 0 ]]; then + for i in $(seq 0 $(( ${#clientIpList[@]} - 1)) ); do + ipAddress=${clientIpList[$i]} + ipAddressPrivate=${clientIpListPrivate[$i]} + zone=${clientIpListZone[$i]} + if $evalInfo; then + echo "NET_CLIENT${i}_IP=$ipAddress" + else + printNode client "$ipAddress" "$ipAddressPrivate" "$zone" + fi + done + fi - for i in $(seq 0 $(( ${#blockstreamerIpList[@]} - 1)) ); do - ipAddress=${blockstreamerIpList[$i]} - ipAddressPrivate=${blockstreamerIpListPrivate[$i]} - zone=${blockstreamerIpListZone[$i]} - if $evalInfo; then - echo "NET_BLOCKSTREAMER${i}_IP=$ipAddress" - else - printNode blockstreamer "$ipAddress" "$ipAddressPrivate" "$zone" - fi - done + if [[ ${#blockstreamerIpList[@]} -gt 0 ]]; then + for i in $(seq 0 $(( ${#blockstreamerIpList[@]} - 1)) ); do + ipAddress=${blockstreamerIpList[$i]} + ipAddressPrivate=${blockstreamerIpListPrivate[$i]} + zone=${blockstreamerIpListZone[$i]} + if $evalInfo; then + echo "NET_BLOCKSTREAMER${i}_IP=$ipAddress" + else + printNode blockstreamer "$ipAddress" "$ipAddressPrivate" "$zone" + fi + done + fi - for i in $(seq 0 $(( ${#archiverIpList[@]} - 1)) ); do - ipAddress=${archiverIpList[$i]} - ipAddressPrivate=${archiverIpListPrivate[$i]} - zone=${archiverIpListZone[$i]} - if $evalInfo; then - echo "NET_ARCHIVER${i}_IP=$ipAddress" - else - printNode archiver "$ipAddress" "$ipAddressPrivate" "$zone" - fi - done + if [[ ${#archiverIpList[@]} -gt 0 ]]; then + for i in $(seq 0 $(( ${#archiverIpList[@]} - 1)) ); do + ipAddress=${archiverIpList[$i]} + ipAddressPrivate=${archiverIpListPrivate[$i]} + zone=${archiverIpListZone[$i]} + if $evalInfo; then + echo "NET_ARCHIVER${i}_IP=$ipAddress" + else + printNode archiver "$ipAddress" "$ipAddressPrivate" "$zone" + fi + done + fi ;; status) cloud_StatusAll