From d80ffa8ad24e384d227259c09ab4d791065e2e0e Mon Sep 17 00:00:00 2001
From: Paul Bellamy <paul.a.bellamy@gmail.com>
Date: Thu, 28 May 2015 11:38:16 +0100
Subject: [PATCH] working on bash argument parsing

---
 proxy/listener.go | 18 ------------------
 weave             | 36 ++++++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 30 deletions(-)
 delete mode 100644 proxy/listener.go

diff --git a/proxy/listener.go b/proxy/listener.go
deleted file mode 100644
index 04251108..00000000
--- a/proxy/listener.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package proxy
-
-import (
-	"crypto/tls"
-	"net"
-)
-
-func (proxy *Proxy) listener(addr string) (net.Listener, error) {
-	listener, err := net.Listen("tcp", addr)
-	if err != nil {
-		return nil, err
-	}
-
-	if proxy.tlsConfig.enabled() {
-		listener = tls.NewListener(listener, proxy.tlsConfig.Config)
-	}
-	return listener, nil
-}
diff --git a/weave b/weave
index 4ca7bb6a..4392381a 100755
--- a/weave
+++ b/weave
@@ -726,26 +726,38 @@ get_ipam_cidr() {
 # weave proxy helpers
 ######################################################################
 
-# TODO: Handle args with spaces
-# TODO: Handle non-absolute paths for certs
+
+# TODO: Handle relative paths for args
 proxy_args() {
     PROXY_VOLUMES=""
     PROXY_ARGS=""
     while [ $# -gt 0 ]; do
-        case $1 in
-          --tlscacert|--tlscacert=*)
-            [[ "${1#*=}" != "$1" ]] || shift
-            PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#--tlscacert=}:/home/weave/tls/ca.pem"
+        case "$1" in
+          --tlscacert)
+            shift
+            PROXY_VOLUMES="$PROXY_VOLUMES -v $1:/home/weave/tls/ca.pem"
             PROXY_ARGS="$PROXY_ARGS --tlscacert /home/weave/tls/ca.pem"
             ;;
-          --tlscert|--tlscert=*)
-            [[ "${1#*=}" != "$1" ]] || shift
-            PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#--tlscert=}:/home/weave/tls/cert.pem"
+          --tlscacert=*)
+            PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#*=}:/home/weave/tls/ca.pem"
+            PROXY_ARGS="$PROXY_ARGS --tlscacert /home/weave/tls/ca.pem"
+            ;;
+          --tlscert)
+            shift
+            PROXY_VOLUMES="$PROXY_VOLUMES -v $1:/home/weave/tls/cert.pem"
             PROXY_ARGS="$PROXY_ARGS --tlscert /home/weave/tls/cert.pem"
             ;;
-          --tlskey|--tlskey=*)
-            [[ "${1#*=}" != "$1" ]] || shift
-            PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#--tlskey=}:/home/weave/tls/key.pem"
+          --tlscert=*)
+            PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#*=}:/home/weave/tls/cert.pem"
+            PROXY_ARGS="$PROXY_ARGS --tlscert /home/weave/tls/cert.pem"
+            ;;
+          --tlskey)
+            shift
+            PROXY_VOLUMES="$PROXY_VOLUMES -v $1:/home/weave/tls/key.pem"
+            PROXY_ARGS="$PROXY_ARGS --tlskey /home/weave/tls/key.pem"
+            ;;
+          --tlskey=*)
+            PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#*=}:/home/weave/tls/key.pem"
             PROXY_ARGS="$PROXY_ARGS --tlskey /home/weave/tls/key.pem"
             ;;
           *)