From 48ceb498320c2769525a1e64cc0d0a0ce4e84bcf Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Mon, 18 Sep 2017 09:16:37 +0100
Subject: [PATCH] refactor: inline and simplify proxy_addrs()

---
 weave | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/weave b/weave
index 48406662..abb8ba04 100755
--- a/weave
+++ b/weave
@@ -1098,20 +1098,15 @@ proxy_args() {
     fi
 }
 
-proxy_addrs() {
+proxy_addr() {
     if addr="$(call_weave GET /proxyaddrs)" ; then
       [ -n "$addr" ] || return 1
-      echo "$addr" | sed "s/0.0.0.0/$PROXY_HOST/g" | tr '\n' ' '
+      echo "$addr" | sed "s/0.0.0.0/$PROXY_HOST/g" | cut -d $'\n' -f1
     else
       return 1
     fi
 }
 
-proxy_addr() {
-    addr=$(proxy_addrs) || return 1
-    echo "$addr" | cut -d ' ' -f1
-}
-
 warn_if_stopping_proxy_in_env() {
     if PROXY_ADDR=$(proxy_addr 2>/dev/null) ; then
         [ "$PROXY_ADDR" != "$DOCKER_CLIENT_HOST" ] || echo "WARNING: It appears that your environment is configured to use the Weave Docker API proxy. Stopping it will break this and subsequent docker invocations. To restore your environment, run 'eval \$(weave env --restore)'."