Merge branch '1.3'

weave

@@ -1142,7 +1142,7 @@ rewrite_etc_hosts() {
     CONTAINERS_PATH=$(dirname $HOSTS)
     MNT=/container
     MNT_HOSTS=$MNT/$(basename $HOSTS)
-    CONTENTS="$(etc_hosts_contents $FQDN $@)"
+    CONTENTS="$(etc_hosts_contents $FQDN "$@")"
     # rewrite /etc/hosts, unlinking the file (so Docker does not modify it again) but
     # leaving it with valid contents...
     docker run --rm --net=none --privileged \
@@ -1736,14 +1736,14 @@ deprecation_warnings() {
         case "$1" in
             -password|-password=*)
                 deprecation_warning $1 "--password"
-                [ "$1" == "-password" ] && shift
+                [ "$1" = "-password" ] && shift
                 ;;
             --password)
                 shift
                 ;;
             -nickname|-nickname=*)
                 deprecation_warning $1 "--nickname"
-                [ "$1" == "-nickname" ] && shift
+                [ "$1" = "-nickname" ] && shift
                 ;;
             --nickname)
                 shift
@@ -1753,21 +1753,21 @@ deprecation_warnings() {
                 ;;
             -iprange|--iprange|-iprange=*|--iprange=*)
                 deprecation_warning $1 "--ipalloc-range"
-                [ ${1#--} == "iprange" ] && shift
+                [ ${1#--} = "iprange" ] && shift
                 ;;
             --ipalloc-range)
                 shift
                 ;;
             -ipsubnet|--ipsubnet|-ipsubnet=*|--ipsubnet=*)
                 deprecation_warning $1 "--ipalloc-default-subnet"
-                [ ${1#--} == "ipsubnet" ] && shift
+                [ ${1#--} = "ipsubnet" ] && shift
                 ;;
             --ipalloc-default-subnet)
                 shift
                 ;;
             -initpeercount|--initpeercount|-initpeercount=*|--initpeercount=*)
                 deprecation_warning $1 "--init-peer-count"
-                [ ${1#--} == "initpeercount" ] && shift
+                [ ${1#--} = "initpeercount" ] && shift
                 ;;
             --init-peer-count)
                 shift
@@ -1860,7 +1860,7 @@ EOF
         ;;
     connect)
         [ $# -gt 0 ] || usage
-        if [ "$1" == "--replace" ] ; then
+        if [ "$1" = "--replace" ] ; then
           replace="-d replace=true"
           shift
         fi