瀏覽代碼

Don't check local domain

Bob Mottram 8 年之前
父節點
當前提交
84d6247463
共有 1 個文件被更改,包括 13 次插入11 次删除
  1. 13
    11
      src/freedombone-utils-config

+ 13
- 11
src/freedombone-utils-config 查看文件

@@ -323,18 +323,20 @@ function check_domains {
323 323
     for d in "${domains_array[@]}"
324 324
     do
325 325
         domain_param=$(echo "$d" | awk -F '=' '{print $1}')
326
-        if [[ "$domain_param" != "DEFAULT_DOMAIN_NAME" && "$domain_param" != "${PROJECT_NAME}.local" ]]; then
326
+        if [[ "$domain_param" != "DEFAULT_DOMAIN_NAME" ]]; then
327 327
             domain_value=$(echo "$d" | awk -F '=' '{print $2}')
328
-            item_in_array "${domain_value}" "${checked_domains[@]}"
329
-            if [[ $? != 0 ]]; then
330
-                # test that this is a valid domain name
331
-                function_check test_domain_name
332
-                test_domain_name "$domain_value"
333
-                # add it to the list of domains
334
-                checked_domains+=("$domain_value")
335
-            else
336
-                echo $"Domain ${domain_value} collides with another app. The domain for each app should be unique."
337
-                exit 673925
328
+            if [[ "$domain_value" != "${PROJECT_NAME}.local" ]]; then
329
+                item_in_array "${domain_value}" "${checked_domains[@]}"
330
+                if [[ $? != 0 ]]; then
331
+                    # test that this is a valid domain name
332
+                    function_check test_domain_name
333
+                    test_domain_name "$domain_value"
334
+                    # add it to the list of domains
335
+                    checked_domains+=("$domain_value")
336
+                else
337
+                    echo $"Domain ${domain_value} collides with another app. The domain for each app should be unique."
338
+                    exit 673925
339
+                fi
338 340
             fi
339 341
         fi
340 342
     done