Pārlūkot izejas kodu

Additional checking of the freedns code

Bob Mottram 9 gadus atpakaļ
vecāks
revīzija
5a79a85c5a
1 mainītis faili ar 29 papildinājumiem un 1 dzēšanām
  1. 29
    1
      src/freedombone-config

+ 29
- 1
src/freedombone-config Parādīt failu

@@ -1391,6 +1391,10 @@ function interactive_configuration {
1391 1391
                                 WIKI_DOMAIN_NAME=
1392 1392
                                 dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1393 1393
                             fi
1394
+                            if [[ $WIKI_CODE == *"."* ]]; then
1395
+                                WIKI_DOMAIN_NAME=
1396
+                                dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1397
+                            fi
1394 1398
                         fi
1395 1399
                     fi
1396 1400
                 fi
@@ -1451,6 +1455,10 @@ function interactive_configuration {
1451 1455
                                 FULLBLOG_DOMAIN_NAME=
1452 1456
                                 dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1453 1457
                             fi
1458
+                            if [[ $FULLBLOG_CODE == *"."* ]]; then
1459
+                                FULLBLOG_DOMAIN_NAME=
1460
+                                dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1461
+                            fi
1454 1462
                         fi
1455 1463
                     fi
1456 1464
                 fi
@@ -1504,6 +1512,10 @@ function interactive_configuration {
1504 1512
                                 OWNCLOUD_DOMAIN_NAME=
1505 1513
                                 dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1506 1514
                             fi
1515
+                            if [[ $OWNCLOUD_CODE == *"."* ]]; then
1516
+                                OWNCLOUD_DOMAIN_NAME=
1517
+                                dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1518
+                            fi
1507 1519
                         fi
1508 1520
                     fi
1509 1521
                 fi
@@ -1557,6 +1569,10 @@ function interactive_configuration {
1557 1569
                                 HUBZILLA_DOMAIN_NAME=
1558 1570
                                 dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1559 1571
                             fi
1572
+                            if [[ $HUBZILLA_CODE == *"."* ]]; then
1573
+                                HUBZILLA_DOMAIN_NAME=
1574
+                                dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1575
+                            fi
1560 1576
                         fi
1561 1577
                     fi
1562 1578
                 fi
@@ -1605,7 +1621,7 @@ function interactive_configuration {
1605 1621
                 if [ ${#welcome_msg} -gt 1 ]; then
1606 1622
                     MICROBLOG_WELCOME_MESSAGE=$welcome_msg
1607 1623
                 fi
1608
-				img_url=$(cat $data | sed -n 3p)
1624
+                img_url=$(cat $data | sed -n 3p)
1609 1625
                 if [ ${#img_url} -gt 1 ]; then
1610 1626
                     MICROBLOG_BACKGROUND_IMAGE_URL=$img_url
1611 1627
                 fi
@@ -1625,6 +1641,10 @@ function interactive_configuration {
1625 1641
                                 MICROBLOG_DOMAIN_NAME=
1626 1642
                                 dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1627 1643
                             fi
1644
+                            if [[ $MICROBLOG_CODE == *"."* ]]; then
1645
+                                MICROBLOG_DOMAIN_NAME=
1646
+                                dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1647
+                            fi
1628 1648
                         fi
1629 1649
                     fi
1630 1650
                 fi
@@ -1679,6 +1699,10 @@ function interactive_configuration {
1679 1699
                                 GIT_DOMAIN_NAME=
1680 1700
                                 dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1681 1701
                             fi
1702
+                            if [[ $GIT_CODE == *"."* ]]; then
1703
+                                GIT_DOMAIN_NAME=
1704
+                                dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1705
+                            fi
1682 1706
                         fi
1683 1707
                     fi
1684 1708
                 else
@@ -1720,6 +1744,10 @@ function interactive_configuration {
1720 1744
                             DEFAULT_DOMAIN_NAME=
1721 1745
                             dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1722 1746
                         fi
1747
+                        if [[ $DEFAULT_DOMAIN_CODE == *"."* ]]; then
1748
+                            DEFAULT_DOMAIN_NAME=
1749
+                            dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
1750
+                        fi
1723 1751
                     fi
1724 1752
                 else
1725 1753
                     dialog --backtitle $"Freedombone Configuration" \