From d8cc45c6503d8b1d240ec8843d07dc921d57ca5b Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Fri, 29 Aug 2014 16:10:29 +0100
Subject: [PATCH] fix weave arg count check

---
 weaver/weave | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/weaver/weave b/weaver/weave
index 695f3a3b..e5a7a27c 100755
--- a/weaver/weave
+++ b/weaver/weave
@@ -1,6 +1,15 @@
 #!/bin/sh
 set -e
 
+usage() {
+    echo "Usage:"
+    echo "weave launch <ipaddr>/<subnet> [-passwd <passwd>] <peer_host> ..."
+    echo "weave run    <ipaddr>/<subnet> <docker run args> ..."
+    exit 1
+}
+
+[ $# -gt 1 ] || usage
+
 BRIDGE=weave
 CONTAINER_IFNAME=ethwe
 MTU=65535
@@ -9,14 +18,7 @@ SCRIPT_DIR=$(dirname $(readlink -f $0))
 COMMAND=$1
 IPADDR=$2
 
-usage() {
-    echo "Usage:"
-    echo "weave launch <ipaddr>/<subnet> [-passwd <passwd>] <peer_host> ..."
-    echo "weave run    <ipaddr>/<subnet> <docker run args> ..."
-    exit 1
-}
-
-shift 2 || usage
+shift 2
 
 [ `id -u` = 0 ] || {
     echo "weave must be run as 'root'"