diff --git a/src/freedombone-config b/src/freedombone-config index be977f31..c9340e68 100755 --- a/src/freedombone-config +++ b/src/freedombone-config @@ -1047,6 +1047,32 @@ function interactive_configuration { fi save_configuration_file + if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then + valid_name= + while [ ! $valid_name ] + do + data=$(tempfile 2>/dev/null) + trap "rm -f $data" 0 1 2 5 15 + dialog --backtitle $"Freedombone Configuration" \ + --inputbox $"Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data + sel=$? + case $sel in + 0) possible_name=$(cat $data) + if [ "$possible_name" ]; then + if [ ${#possible_name} -gt 1 ]; then + valid_name="$possible_name" + MY_NAME="$possible_name" + break; + fi + fi + ;; + 1) exit 1;; + 255) exit 1;; + esac + done + save_configuration_file + fi + if [[ $MINIMAL_INSTALL == "no" ]]; then if [[ $(grep "INSTALLING_ON_BBB" temp.cfg | awk -F '=' '{print $2}') == "yes" ]]; then dialog --title $"Install Target" \ @@ -1324,7 +1350,7 @@ function interactive_configuration { NAMESERVER1='85.214.73.63' NAMESERVER2='213.73.91.35' fi - + if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then data=$(tempfile 2>/dev/null) trap "rm -f $data" 0 1 2 5 15 @@ -1455,32 +1481,6 @@ function interactive_configuration { save_configuration_file fi - if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then - valid_name= - while [ ! $valid_name ] - do - data=$(tempfile 2>/dev/null) - trap "rm -f $data" 0 1 2 5 15 - dialog --backtitle $"Freedombone Configuration" \ - --inputbox $"Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data - sel=$? - case $sel in - 0) possible_name=$(cat $data) - if [ "$possible_name" ]; then - if [ ${#possible_name} -gt 1 ]; then - valid_name="$possible_name" - MY_NAME="$possible_name" - break; - fi - fi - ;; - 1) exit 1;; - 255) exit 1;; - esac - done - save_configuration_file - fi - if [[ $MINIMAL_INSTALL == "no" && $ONION_ONLY == "no" ]]; then SET_STATIC_IP="no" dialog --title $"Static local IP address" \