From 36ee71cb0a9973d449f2343235c437ea1faa231f Mon Sep 17 00:00:00 2001 From: Mirko Geissler Date: Thu, 11 Aug 2016 16:32:22 +0200 Subject: [PATCH] Put hyphen at the end of group expression --- plugins/common/functions | 2 +- tests/unit/20_domains.bats | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/common/functions b/plugins/common/functions index d60357c71..32d8ad9ac 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -1065,7 +1065,7 @@ strip_inline_comments() { is_valid_hostname() { declare desc="return 0 if argument is a valid hostname; else return 1" - local hostname_string="${1,,}"; local hostname_regex='^([a-z0-9\-\*]+\.)*[a-z0-9\-\*]+$' + local hostname_string="${1,,}"; local hostname_regex='^([a-z0-9\*-]+\.)*[a-z0-9\*-]+$' if [[ $hostname_string =~ $hostname_regex ]]; then return 0 else diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats index 173b36fc0..4a0216747 100644 --- a/tests/unit/20_domains.bats +++ b/tests/unit/20_domains.bats @@ -35,6 +35,10 @@ teardown() { echo "output: "$output echo "status: "$status assert_success + run dokku domains:add $TEST_APP a--domain.with--hyphens + echo "output: "$output + echo "status: "$status + assert_success } @test "(domains) domains:add (multiple)" {