From 5cbc4fa33d40ba29cf25b5437cb85665ce53d90f Mon Sep 17 00:00:00 2001
From: Ilya Dmitrichenko <errordeveloper@gmail.com>
Date: Thu, 8 Jan 2015 12:59:53 +0000
Subject: [PATCH] Make passing of password more readable

---
 weave | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/weave b/weave
index b29a647d..53f9aee8 100755
--- a/weave
+++ b/weave
@@ -471,11 +471,11 @@ case "$COMMAND" in
         fi
         if [ "$1" = "-password" ] ; then
             [ $# -gt 1 ] || usage
-            PASSWORD=$2
+            PASSWORD_ARGS="-e WEAVE_PASSWORD=$2"
             shift 2
         elif [ "$1" = "-passwordfile" ] ; then
             [ $# -gt 1 ] || usage
-            PASSWORDFILE=$2
+            PASSWORD_ARGS="--env-file=$2"
             shift 2
         fi
         # Set WEAVE_DOCKER_ARGS in the environment in order to supply
@@ -483,7 +483,7 @@ case "$COMMAND" in
         # when launching the weave container.
         CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME \
             -p $PORT:$PORT/tcp -p $PORT:$PORT/udp \
-            ${PASSWORD:+-e WEAVE_PASSWORD="$PASSWORD"} ${PASSWORDFILE:+--env-file="$PASSWORDFILE"} \
+            $PASSWORD_ARGS \
             $WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR -iface $CONTAINER_IFNAME "$@")
         with_container_netns $CONTAINER launch >/dev/null
         echo $CONTAINER