Browse Source

More checking for email creation

Bob Mottram 8 years ago
parent
commit
11ac6ea7d7
1 changed files with 12 additions and 1 deletions
  1. 12
    1
      src/freedombone-base-email

+ 12
- 1
src/freedombone-base-email View File

@@ -1649,8 +1649,19 @@ function install_email {
1649 1649
     read_config_param MY_EMAIL_ADDRESS
1650 1650
     read_config_param DH_KEYLENGTH
1651 1651
 
1652
-    if [ ${#MY_EMAIL_ADDRESS} -lt 3 ]; then
1652
+    if [ ! $MY_USERNAME ]; then
1653
+        echo $'No username for email installation'
1654
+        exit 73672
1655
+    fi
1656
+    if [ ! $DEFAULT_DOMAIN_NAME ]; then
1657
+        echo $'No default domain name for email installation'
1658
+        exit 57634
1659
+    fi
1660
+
1661
+    my_email="$MY_EMAIL_ADDRESS"
1662
+    if [ ${#my_email} -lt 3 ]; then
1653 1663
         MY_EMAIL_ADDRESS=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}
1664
+        write_config_param "MY_EMAIL_ADDRESS" "$MY_EMAIL_ADDRESS"
1654 1665
     fi
1655 1666
 
1656 1667
     install_email_basic