From 5a79a85c5aef01e6268b143dc731fd8fd8bfd930 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 23 Feb 2016 09:19:24 +0000 Subject: [PATCH] Additional checking of the freedns code --- src/freedombone-config | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/freedombone-config b/src/freedombone-config index ac38051f..38e4b09c 100755 --- a/src/freedombone-config +++ b/src/freedombone-config @@ -1391,6 +1391,10 @@ function interactive_configuration { WIKI_DOMAIN_NAME= dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 fi + if [[ $WIKI_CODE == *"."* ]]; then + WIKI_DOMAIN_NAME= + dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 + fi fi fi fi @@ -1451,6 +1455,10 @@ function interactive_configuration { FULLBLOG_DOMAIN_NAME= dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 fi + if [[ $FULLBLOG_CODE == *"."* ]]; then + FULLBLOG_DOMAIN_NAME= + dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 + fi fi fi fi @@ -1504,6 +1512,10 @@ function interactive_configuration { OWNCLOUD_DOMAIN_NAME= dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 fi + if [[ $OWNCLOUD_CODE == *"."* ]]; then + OWNCLOUD_DOMAIN_NAME= + dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 + fi fi fi fi @@ -1557,6 +1569,10 @@ function interactive_configuration { HUBZILLA_DOMAIN_NAME= dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 fi + if [[ $HUBZILLA_CODE == *"."* ]]; then + HUBZILLA_DOMAIN_NAME= + dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 + fi fi fi fi @@ -1605,7 +1621,7 @@ function interactive_configuration { if [ ${#welcome_msg} -gt 1 ]; then MICROBLOG_WELCOME_MESSAGE=$welcome_msg fi - img_url=$(cat $data | sed -n 3p) + img_url=$(cat $data | sed -n 3p) if [ ${#img_url} -gt 1 ]; then MICROBLOG_BACKGROUND_IMAGE_URL=$img_url fi @@ -1625,6 +1641,10 @@ function interactive_configuration { MICROBLOG_DOMAIN_NAME= dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 fi + if [[ $MICROBLOG_CODE == *"."* ]]; then + MICROBLOG_DOMAIN_NAME= + dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 + fi fi fi fi @@ -1679,6 +1699,10 @@ function interactive_configuration { GIT_DOMAIN_NAME= dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 fi + if [[ $GIT_CODE == *"."* ]]; then + GIT_DOMAIN_NAME= + dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 + fi fi fi else @@ -1720,6 +1744,10 @@ function interactive_configuration { DEFAULT_DOMAIN_NAME= dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 fi + if [[ $DEFAULT_DOMAIN_CODE == *"."* ]]; then + DEFAULT_DOMAIN_NAME= + dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50 + fi fi else dialog --backtitle $"Freedombone Configuration" \