From 53e70b02f4b1ef82aed137115f3bb275e526d630 Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Wed, 15 Jul 2015 11:57:48 +0200 Subject: [PATCH] Don't fast-fail if weave isn't present --- scope | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scope b/scope index 942eb8a48..e85a6200d 100755 --- a/scope +++ b/scope @@ -27,7 +27,7 @@ HOSTNAME=scope DOMAINNAME=weave.local FQDN=$HOSTNAME.$DOMAINNAME DOCKER_BRIDGE=${DOCKER_BRIDGE:-docker0} -WEAVE=$(which weave) +WEAVE=$(set +e; which weave) IP_REGEXP="[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" IP_ADDR_CMD="find /sys/class/net -type l | xargs -n1 basename | grep -vE 'docker|veth|lo' | \ xargs -n1 ip addr show | grep inet | awk '{ print \$2 }' | grep -oE '$IP_REGEXP'"