Bob Mottram 9 years ago
parent
commit
d8f0965a33
1 changed files with 27 additions and 27 deletions
  1. 27
    27
      src/freedombone-config

+ 27
- 27
src/freedombone-config View File

@@ -1047,6 +1047,32 @@ function interactive_configuration {
1047 1047
     fi
1048 1048
     save_configuration_file
1049 1049
 
1050
+    if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
1051
+        valid_name=
1052
+        while [ ! $valid_name ]
1053
+        do
1054
+            data=$(tempfile 2>/dev/null)
1055
+            trap "rm -f $data" 0 1 2 5 15
1056
+            dialog --backtitle $"Freedombone Configuration" \
1057
+                   --inputbox $"Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
1058
+            sel=$?
1059
+            case $sel in
1060
+                0)  possible_name=$(cat $data)
1061
+                    if [ "$possible_name" ]; then
1062
+                        if [ ${#possible_name} -gt 1 ]; then
1063
+                            valid_name="$possible_name"
1064
+                            MY_NAME="$possible_name"
1065
+                            break;
1066
+                        fi
1067
+                    fi
1068
+                    ;;
1069
+                1) exit 1;;
1070
+                255) exit 1;;
1071
+            esac
1072
+        done
1073
+        save_configuration_file
1074
+    fi
1075
+    
1050 1076
     if [[ $MINIMAL_INSTALL == "no" ]]; then
1051 1077
         if [[ $(grep "INSTALLING_ON_BBB" temp.cfg | awk -F '=' '{print $2}') == "yes" ]]; then
1052 1078
             dialog --title $"Install Target" \
@@ -1324,7 +1350,7 @@ function interactive_configuration {
1324 1350
         NAMESERVER1='85.214.73.63'
1325 1351
         NAMESERVER2='213.73.91.35'
1326 1352
     fi
1327
-
1353
+    
1328 1354
     if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
1329 1355
         data=$(tempfile 2>/dev/null)
1330 1356
         trap "rm -f $data" 0 1 2 5 15
@@ -1455,32 +1481,6 @@ function interactive_configuration {
1455 1481
         save_configuration_file
1456 1482
     fi
1457 1483
 
1458
-    if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
1459
-        valid_name=
1460
-        while [ ! $valid_name ]
1461
-        do
1462
-            data=$(tempfile 2>/dev/null)
1463
-            trap "rm -f $data" 0 1 2 5 15
1464
-            dialog --backtitle $"Freedombone Configuration" \
1465
-                   --inputbox $"Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
1466
-            sel=$?
1467
-            case $sel in
1468
-                0)  possible_name=$(cat $data)
1469
-                    if [ "$possible_name" ]; then
1470
-                        if [ ${#possible_name} -gt 1 ]; then
1471
-                            valid_name="$possible_name"
1472
-                            MY_NAME="$possible_name"
1473
-                            break;
1474
-                        fi
1475
-                    fi
1476
-                    ;;
1477
-                1) exit 1;;
1478
-                255) exit 1;;
1479
-            esac
1480
-        done
1481
-        save_configuration_file
1482
-    fi
1483
-
1484 1484
     if [[ $MINIMAL_INSTALL == "no" && $ONION_ONLY == "no" ]]; then
1485 1485
         SET_STATIC_IP="no"
1486 1486
         dialog --title $"Static local IP address" \