From 84d6247463db40a6a17a026149dfc2aff23bfb6b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 19 Oct 2016 20:17:17 +0100
Subject: [PATCH] Don't check local domain
---
src/freedombone-utils-config | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/freedombone-utils-config b/src/freedombone-utils-config
index 118871ba0..37486e633 100755
--- a/src/freedombone-utils-config
+++ b/src/freedombone-utils-config
@@ -323,18 +323,20 @@ function check_domains {
for d in "${domains_array[@]}"
do
domain_param=$(echo "$d" | awk -F '=' '{print $1}')
- if [[ "$domain_param" != "DEFAULT_DOMAIN_NAME" && "$domain_param" != "${PROJECT_NAME}.local" ]]; then
+ if [[ "$domain_param" != "DEFAULT_DOMAIN_NAME" ]]; then
domain_value=$(echo "$d" | awk -F '=' '{print $2}')
- item_in_array "${domain_value}" "${checked_domains[@]}"
- if [[ $? != 0 ]]; then
- # test that this is a valid domain name
- function_check test_domain_name
- test_domain_name "$domain_value"
- # add it to the list of domains
- checked_domains+=("$domain_value")
- else
- echo $"Domain ${domain_value} collides with another app. The domain for each app should be unique."
- exit 673925
+ if [[ "$domain_value" != "${PROJECT_NAME}.local" ]]; then
+ item_in_array "${domain_value}" "${checked_domains[@]}"
+ if [[ $? != 0 ]]; then
+ # test that this is a valid domain name
+ function_check test_domain_name
+ test_domain_name "$domain_value"
+ # add it to the list of domains
+ checked_domains+=("$domain_value")
+ else
+ echo $"Domain ${domain_value} collides with another app. The domain for each app should be unique."
+ exit 673925
+ fi
fi
fi
done
--
GitLab