From dcedf241bbaf4f6287388068984dbe057a2361ee Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Mon, 1 Jun 2015 19:01:20 +0100 Subject: [PATCH] simplify dns-add/remove --- weave | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/weave b/weave index 66ec8558..50afd3a1 100755 --- a/weave +++ b/weave @@ -990,28 +990,24 @@ case "$COMMAND" in dns-add) collect_ip_args "$@" shift $IP_COUNT - [ $# -ge 1 ] || usage + [ $# -eq 1 -o \( $# -eq 3 -a "$2" = "-h" \) ] || usage + check_dns_running CONTAINER=$(container_id $1) if [ $# -eq 1 ] ; then - check_dns_running when_has_fqdn $CONTAINER put_dns_fqdn $IP_ARGS else - [ $# -eq 3 -a "$2" = "-h" ] || usage - check_dns_running put_dns_fqdn $CONTAINER "$3" $IP_ARGS fi ;; dns-remove) collect_ip_args "$@" shift $IP_COUNT - [ $# -ge 1 ] || usage + [ $# -eq 1 -o \( $# -eq 3 -a "$2" = "-h" \) ] || usage + check_dns_running CONTAINER=$(container_id $1) if [ $# -eq 1 ] ; then - check_dns_running delete_dns $CONTAINER $IP_ARGS else - [ $# -eq 3 -a "$2" = "-h" ] || usage - check_dns_running delete_dns_fqdn $CONTAINER "$3" $IP_ARGS fi ;;