Bladeren bron

DDNS login details

Bob Mottram 9 jaren geleden
bovenliggende
commit
a68443cc8c
1 gewijzigde bestanden met toevoegingen van 23 en 4 verwijderingen
  1. 23
    4
      src/freedombone-config

+ 23
- 4
src/freedombone-config Bestand weergeven

1066
         esac
1066
         esac
1067
         save_configuration_file
1067
         save_configuration_file
1068
 
1068
 
1069
-        while [ ! $DDNS_USERNAME ]
1069
+        valid_ddns_username=
1070
+        while [ ! $valid_ddns_username ]
1070
         do
1071
         do
1071
             data=$(tempfile 2>/dev/null)
1072
             data=$(tempfile 2>/dev/null)
1072
             trap "rm -f $data" 0 1 2 5 15
1073
             trap "rm -f $data" 0 1 2 5 15
1074
                    --inputbox $"Dynamic DNS provider username" 10 30 "$(grep 'DDNS_USERNAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
1075
                    --inputbox $"Dynamic DNS provider username" 10 30 "$(grep 'DDNS_USERNAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
1075
             sel=$?
1076
             sel=$?
1076
             case $sel in
1077
             case $sel in
1077
-                0) DDNS_USERNAME=$(cat $data);;
1078
+                0)  possible_username=$(cat $data)
1079
+                    if [ "$possible_username" ]; then
1080
+                        if [ ${#possible_username} -gt 1 ]; then
1081
+                            valid_ddns_username=$(cat $data)
1082
+                            DDNS_USERNAME=$valid_ddns_username
1083
+                            break;
1084
+                        fi
1085
+                    fi
1086
+                    ;;
1078
                 1) exit 1;;
1087
                 1) exit 1;;
1079
                 255) exit 1;;
1088
                 255) exit 1;;
1080
             esac
1089
             esac
1081
         done
1090
         done
1082
         save_configuration_file
1091
         save_configuration_file
1083
 
1092
 
1084
-        while [ ! $DDNS_PASSWORD ]
1093
+        valid_ddns_password=
1094
+        while [ ! $valid_ddns_password ]
1085
         do
1095
         do
1086
             data=$(tempfile 2>/dev/null)
1096
             data=$(tempfile 2>/dev/null)
1087
             trap "rm -f $data" 0 1 2 5 15
1097
             trap "rm -f $data" 0 1 2 5 15
1091
                    --passwordbox $"Dynamic DNS provider password" 10 30 "$(grep 'DDNS_PASSWORD' temp.cfg | awk -F '=' '{print $2}')" 2> $data
1101
                    --passwordbox $"Dynamic DNS provider password" 10 30 "$(grep 'DDNS_PASSWORD' temp.cfg | awk -F '=' '{print $2}')" 2> $data
1092
             sel=$?
1102
             sel=$?
1093
             case $sel in
1103
             case $sel in
1094
-                0) DDNS_PASSWORD=$(cat $data);;
1104
+                0)  possible_password=$(cat $data)
1105
+                    if [ "$possible_password" ]; then
1106
+                        if [ ${#possible_password} -gt 1 ]; then
1107
+                            valid_ddns_password=$(cat $data)
1108
+                            DDNS_PASSWORD=$valid_ddns_password
1109
+                            break;
1110
+                        fi
1111
+                    fi
1112
+                    ;;
1095
                 1) exit 1;;
1113
                 1) exit 1;;
1096
                 255) exit 1;;
1114
                 255) exit 1;;
1097
             esac
1115
             esac
1118
                         if [ ${#possible_name} -gt 1 ]; then
1136
                         if [ ${#possible_name} -gt 1 ]; then
1119
                             valid_name="$possible_name"
1137
                             valid_name="$possible_name"
1120
                             MY_NAME="$possible_name"
1138
                             MY_NAME="$possible_name"
1139
+                            break;
1121
                         fi
1140
                         fi
1122
                     fi
1141
                     fi
1123
                     ;;
1142
                     ;;