diff --git a/src/freedombone b/src/freedombone index 256ae3ac..cc2397c5 100755 --- a/src/freedombone +++ b/src/freedombone @@ -430,11 +430,11 @@ function interactive_configuration { --inputbox "Dynamic DNS provider username" 10 30 2> $data sel=$? case $sel in - 0) DDNS_USERNAME=$data;; + 0) DDNS_USERNAME=$(cat $data);; 1) exit 0;; 255) exit 0;; esac - if [[ $DDNS_USERNAME=="" ]]; then + if [ ! $DDNS_USERNAME ]; then exit 5245 fi @@ -446,16 +446,40 @@ function interactive_configuration { --passwordbox "Dynamic DNS provider password" 10 30 2> $data sel=$? case $sel in - 0) DDNS_PASSWORD=$data;; + 0) DDNS_PASSWORD=$(cat $data);; 1) exit 0;; 255) exit 0;; esac data=$(tempfile 2>/dev/null) trap "rm -f $data" 0 1 2 5 15 - if [[ $DDNS_PASSWORD=="" ]]; then + if [ ! $DDNS_PASSWORD ]; then exit 7229 fi + dialog --backtitle "Freedombone Configuration" \ + --inputbox "Your full name (or nick)" 10 30 2> $data + sel=$? + case $sel in + 0) MY_NAME=$(cat $data);; + 1) exit 0;; + 255) exit 0;; + esac + if [ ! $MY_NAME ]; then + exit 3784 + fi + + dialog --backtitle "Freedombone Configuration" \ + --inputbox "Your email address" 10 30 2> $data + sel=$? + case $sel in + 0) MY_EMAIL_ADDRESS=$(cat $data);; + 1) exit 0;; + 255) exit 0;; + esac + if [ ! $MY_EMAIL_ADDRESS ]; then + exit 8357 + fi + exit 0 }