diff --git a/src/freedombone-config b/src/freedombone-config index c9de6dbb..19de44f1 100755 --- a/src/freedombone-config +++ b/src/freedombone-config @@ -142,12 +142,15 @@ function show_help { function validate_freedns_code { freedns_code="$1" + + FREEDNS_MESSAGE=$"Please enter the FreeDNS code for this domain.\n\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters." + if [[ "$freedns_code" == *"."* || "$freedns_code" == "http"* || "$freedns_code" == *"wget "* || "$freedns_code" == *" "* ]]; then - echo $'Only the code between ? and = should be entered' + dialog --title $"Invalid Freedns Code" --msgbox $'$FREEDNS_MESSAGE' 10 70 VALID_CODE= fi if [ ${#freedns_code} -lt 30 ]; then - echo $'Freedns code is too short. Did you enter the entire code?' + dialog --title $"Invalid Freedns Code" --msgbox $'Freedns code is too short. Did you enter the entire code?' 6 70 VALID_CODE= fi VALID_CODE='yes' @@ -659,8 +662,6 @@ function interactive_configuration { interactive_select_language - FREEDNS_MESSAGE=$"Please enter the FreeDNS code for this domain.\n\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters." - if [[ $ONION_ONLY == "no" ]]; then INITIAL_MESSAGE=$"Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\n\nEnsure that you have your domain and dynamic DNS settings ready.\n\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE" else