diff --git a/weave b/weave index 4e065a5b..ba4f2f17 100755 --- a/weave +++ b/weave @@ -24,45 +24,48 @@ IP_REGEXP="[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" CIDR_REGEXP="$IP_REGEXP/[0-9]{1,2}" usage() { - echo "Usage:" - echo "weave setup" - echo "weave launch [--password ] [--nickname ]" - echo " [--ipalloc-range [--ipalloc-default-subnet ]]" - echo " [--no-discovery] [--init-peer-count ] ..." - echo "weave launch-router [--password ] [--nickname ]" - echo " [--ipalloc-range [--ipalloc-default-subnet ]]" - echo " [--no-discovery] [--init-peer-count ] ..." - echo "weave launch-dns []" - echo "weave launch-proxy [-H ] [--with-dns | --without-dns]" - echo " [--no-default-ipalloc]" - echo "weave connect [--replace] [ ...]" - echo "weave forget ..." - echo "weave run [--with-dns | --without-dns] [ ...]" - echo " ..." - echo "weave start [ ...] " - echo "weave attach [ ...] " - echo "weave detach [ ...] " - echo "weave dns-add [ ...] [-h ]" - echo "weave dns-remove [ ...] [-h ]" - echo "weave expose [ ...] [-h ]" - echo "weave hide [ ...]" - echo "weave ps [ ...]" - echo "weave status" - echo "weave env" - echo "weave config" - echo "weave version" - echo "weave stop" - echo "weave stop-router" - echo "weave stop-dns" - echo "weave stop-proxy" - echo "weave reset" - echo "weave rmpeer " - echo - echo "where = [:]" - echo " = /" - echo " = [ip:] | net: | net:default" - echo " = [tcp://][]: | [unix://]/path/to/socket" - echo " = or weave internal peer ID" + cat >&2 <] [--nickname ] + [--ipalloc-range [--ipalloc-default-subnet ]] + [--no-discovery] [--init-peer-count ] ... +weave launch-router [--password ] [--nickname ] + [--ipalloc-range [--ipalloc-default-subnet ]] + [--no-discovery] [--init-peer-count ] ... +weave launch-dns [] +weave launch-proxy [-H ] [--with-dns | --without-dns] + [--no-default-ipalloc] +weave connect [--replace] [ ...] +weave forget ... +weave run [--with-dns | --without-dns] [ ...] + ... +weave start [ ...] +weave attach [ ...] +weave detach [ ...] +weave dns-add [ ...] [-h ] +weave dns-remove [ ...] [-h ] +weave expose [ ...] [-h ] +weave hide [ ...] +weave ps [ ...] +weave status +weave env +weave config +weave version +weave stop +weave stop-router +weave stop-dns +weave stop-proxy +weave reset +weave rmpeer + +where = [:] + = / + = [ip:] | net: | net:default + = [tcp://][]: | [unix://]/path/to/socket + = or weave internal peer ID +EOF exit 1 }