Merge pull request #1825 from weaveworks/1824-idempotent-env-restore

make `eval $(weave env)` idempotent; LGTM. Fixes #1824
weaveworks · Dec 23, 2015 · b45ac75 · b45ac75
2 parents ba266ef + c7c669f
commit b45ac75
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/weave b/weave
@@ -1880,7 +1880,8 @@ EOF
     env|proxy-env)
         [ "$COMMAND" = "env" ] || deprecation_warning "$COMMAND" "'weave env'"
         if PROXY_ADDR=$(proxy_addr) ; then
-            echo "export DOCKER_HOST=$PROXY_ADDR ORIG_DOCKER_HOST=$DOCKER_CLIENT_HOST"
+            [ "$PROXY_ADDR" = "$DOCKER_CLIENT_HOST" ] || RESTORE="ORIG_DOCKER_HOST=$DOCKER_CLIENT_HOST"
+            echo "export DOCKER_HOST=$PROXY_ADDR $RESTORE"
         fi
         ;;
     config|proxy-config)