From 4ecaa0f508a6eb9ff634cf6d2c888fb892448d8c Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 18 Aug 2015 09:00:01 +0100 Subject: [PATCH] don't put blank lines around sub-status not what I had in mind, and it breaks the tests --- weave | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/weave b/weave index 4ede0594..16ded68c 100755 --- a/weave +++ b/weave @@ -1324,21 +1324,21 @@ case "$COMMAND" in ;; status) res=0 - OMIT_PROXY= + SUB_STATUS= STATUS_URL="/status" while [ $# -gt 0 ] ; do - OMIT_PROXY=1 + SUB_STATUS=1 STATUS_URL="$STATUS_URL/$1" shift done - echo + [ -n "$SUB_STATUS" ] || echo call_weave GET $STATUS_URL || res=1 - if [ -z "$OMIT_PROXY" ] && check_running $PROXY_CONTAINER_NAME 2>/dev/null ; then + if [ -z "$SUB_STATUS" ] && check_running $PROXY_CONTAINER_NAME 2>/dev/null ; then echo echo " Service: proxy" echo " Address: $(proxy_addr)" fi - echo + [ -n "$SUB_STATUS" ] || echo [ $res -eq 0 ] ;; report)