From ffc5a78139619c6a9928dc159ca6f7c126489b73 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Mon, 14 Nov 2016 09:59:47 +0000
Subject: [PATCH 1/4] Add code-coverage options to weaver version call

---
 prog/weave-kube/launch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prog/weave-kube/launch.sh b/prog/weave-kube/launch.sh
index 7c82e8ef..82d38665 100755
--- a/prog/weave-kube/launch.sh
+++ b/prog/weave-kube/launch.sh
@@ -30,7 +30,7 @@ EOF
 fi
 
 SOURCE_BINARY=/usr/bin/weaveutil
-VERSION=$(/home/weave/weaver --version | sed -E 's/weave router (.*?)/\1/')
+VERSION=$(/home/weave/weaver $EXTRA_ARGS --version | sed -E 's/weave router (.*?)/\1/')
 PLUGIN="weave-plugin-$VERSION"
 
 install_cni_plugin() {

From 15d91c558bc6daf40a6c1db22a8fe017c7371953 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Mon, 14 Nov 2016 12:49:00 +0000
Subject: [PATCH 2/4] Quote version string which may contain spaces, etc

---
 prog/weave-kube/launch.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/prog/weave-kube/launch.sh b/prog/weave-kube/launch.sh
index 82d38665..81bad54a 100755
--- a/prog/weave-kube/launch.sh
+++ b/prog/weave-kube/launch.sh
@@ -35,8 +35,8 @@ PLUGIN="weave-plugin-$VERSION"
 
 install_cni_plugin() {
     mkdir -p $1 || return 1
-    if [ ! -f $1/$PLUGIN ]; then
-        cp "$SOURCE_BINARY" $1/$PLUGIN
+    if [ ! -f "$1/$PLUGIN" ]; then
+        cp "$SOURCE_BINARY" "$1/$PLUGIN"
     fi
 }
 
@@ -44,7 +44,7 @@ upgrade_cni_plugin_symlink() {
     # Remove potential temporary symlink from previous failed upgrade:
     rm -f $1/$2.tmp
     # Atomically create a symlink to the plugin:
-    ln -s $1/$PLUGIN $1/$2.tmp && mv -f $1/$2.tmp $1/$2
+    ln -s "$1/$PLUGIN" $1/$2.tmp && mv -f $1/$2.tmp $1/$2
 }
 
 upgrade_cni_plugin() {

From 47cdf2b7552141e9f86a52ab55e70ddd85977e6b Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 22 Nov 2016 15:42:53 +0000
Subject: [PATCH 3/4] Simplify version sed

---
 prog/weave-kube/launch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prog/weave-kube/launch.sh b/prog/weave-kube/launch.sh
index 81bad54a..bc2f15b6 100755
--- a/prog/weave-kube/launch.sh
+++ b/prog/weave-kube/launch.sh
@@ -30,7 +30,7 @@ EOF
 fi
 
 SOURCE_BINARY=/usr/bin/weaveutil
-VERSION=$(/home/weave/weaver $EXTRA_ARGS --version | sed -E 's/weave router (.*?)/\1/')
+VERSION=$(/home/weave/weaver $EXTRA_ARGS --version | sed -e 's/weave router //')
 PLUGIN="weave-plugin-$VERSION"
 
 install_cni_plugin() {

From 937036aa64ccdaa952df530f540f6f2ca1eb6c13 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 22 Nov 2016 15:43:17 +0000
Subject: [PATCH 4/4] Simplify default version string

---
 prog/plugin/main.go     | 2 +-
 prog/weave-npc/main.go  | 2 +-
 prog/weaveproxy/main.go | 2 +-
 prog/weaver/main.go     | 2 +-
 site/troubleshooting.md | 2 +-
 weave                   | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/prog/plugin/main.go b/prog/plugin/main.go
index 8a9c4ac9..cf6d0ad0 100644
--- a/prog/plugin/main.go
+++ b/prog/plugin/main.go
@@ -22,7 +22,7 @@ import (
 	"github.com/weaveworks/weave/plugin/skel"
 )
 
-var version = "(unreleased version)"
+var version = "unreleased"
 
 var Log = common.Log
 
diff --git a/prog/weave-npc/main.go b/prog/weave-npc/main.go
index 58b3e994..ecc26d2a 100644
--- a/prog/weave-npc/main.go
+++ b/prog/weave-npc/main.go
@@ -24,7 +24,7 @@ import (
 )
 
 var (
-	version     = "(unreleased)"
+	version     = "unreleased"
 	metricsAddr string
 )
 
diff --git a/prog/weaveproxy/main.go b/prog/weaveproxy/main.go
index a2688dee..d8e58b21 100644
--- a/prog/weaveproxy/main.go
+++ b/prog/weaveproxy/main.go
@@ -11,7 +11,7 @@ import (
 	"github.com/weaveworks/weave/proxy"
 )
 
-var version = "(unreleased version)"
+var version = "unreleased"
 
 var Log = common.Log
 
diff --git a/prog/weaver/main.go b/prog/weaver/main.go
index 00d08de0..92cb5bba 100644
--- a/prog/weaver/main.go
+++ b/prog/weaver/main.go
@@ -27,7 +27,7 @@ import (
 	weave "github.com/weaveworks/weave/router"
 )
 
-var version = "(unreleased version)"
+var version = "unreleased"
 
 var Log = common.Log
 
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index 4f67e739..b5c2d2b0 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -302,7 +302,7 @@ latest snapshot release using:
     sudo chmod a+x /usr/local/bin/weave
     weave setup
 
-Snapshot releases report the script version as "(unreleased version)",
+Snapshot releases report the script version as "unreleased",
 and the container image versions as git hashes.
 
 
diff --git a/weave b/weave
index 8e9247d3..513fb050 100755
--- a/weave
+++ b/weave
@@ -3,9 +3,9 @@ set -e
 
 [ -n "$WEAVE_DEBUG" ] && set -x
 
-SCRIPT_VERSION="(unreleased version)"
+SCRIPT_VERSION="unreleased"
 IMAGE_VERSION=latest
-[ "$SCRIPT_VERSION" = "(unreleased version)" ] || IMAGE_VERSION=$SCRIPT_VERSION
+[ "$SCRIPT_VERSION" = "unreleased" ] || IMAGE_VERSION=$SCRIPT_VERSION
 IMAGE_VERSION=${WEAVE_VERSION:-$IMAGE_VERSION}
 
 # - Docker versions prior to 1.6 cannot pull images from DockerHub