Bob Mottram 9 лет назад
Родитель
Сommit
183c1fb093
1 измененных файлов: 22 добавлений и 11 удалений
  1. 22
    11
      src/freedombone-config

+ 22
- 11
src/freedombone-config Просмотреть файл

@@ -550,6 +550,17 @@ function interactive_configuration {
550 550
           1) exit 1;;
551 551
           255) exit 1;;
552 552
       esac
553
+
554
+      data=$(tempfile 2>/dev/null)
555
+      trap "rm -f $data" 0 1 2 5 15
556
+      dialog --backtitle "Freedombone Configuration" \
557
+          --inputbox "Give your mesh peer a name" 10 40 "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
558
+      sel=$?
559
+      case $sel in
560
+          0) ESSID=$(cat $data);;
561
+          1) exit 1;;
562
+          255) exit 1;;
563
+      esac
553 564
   fi
554 565
 
555 566
   if [[ $ENABLE_BATMAN == "yes" ]]; then
@@ -938,17 +949,17 @@ function interactive_configuration {
938 949
       while [ ! $MY_NAME ]
939 950
       do
940 951
           data=$(tempfile 2>/dev/null)
941
-		  trap "rm -f $data" 0 1 2 5 15
942
-		  dialog --backtitle "Freedombone Configuration" \
943
-				 --inputbox "Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
944
-		  sel=$?
945
-		  case $sel in
946
-			  0) MY_NAME=$(cat $data);;
947
-			  1) exit 1;;
948
-			  255) exit 1;;
949
-		  esac
950
-	  done
951
-	  save_configuration_file
952
+          trap "rm -f $data" 0 1 2 5 15
953
+          dialog --backtitle "Freedombone Configuration" \
954
+                 --inputbox "Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
955
+          sel=$?
956
+          case $sel in
957
+              0) MY_NAME=$(cat $data);;
958
+              1) exit 1;;
959
+              255) exit 1;;
960
+          esac
961
+      done
962
+      save_configuration_file
952 963
   fi
953 964
 
954 965
   if [ ! $LOCAL_NETWORK_STATIC_IP_ADDRESS ]; then