From dbbb8c690aeed9505ef03e1a1afab2226b684818 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 11 Sep 2014 07:15:15 +0100 Subject: [PATCH] nicer error message on 'weave status' when there is no weave container. --- weaver/weave | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/weaver/weave b/weaver/weave index e7ece3ad..a6dad05f 100755 --- a/weaver/weave +++ b/weaver/weave @@ -87,7 +87,10 @@ case "$COMMAND" in IFACE=eth0 ;; status) - DOCKERIP=$(docker inspect --format='{{ .NetworkSettings.IPAddress }}' weave) + if ! DOCKERIP=$(docker inspect --format='{{ .NetworkSettings.IPAddress }}' weave 2>/dev/null) ; then + echo "There is no weave container." >&2 + exit 1 + fi if [ -z "$DOCKERIP" ] ; then echo "The weave container is not running." >&2 exit 1