Bob Mottram před 7 roky
rodič
revize
1464ea0613
1 změnil soubory, kde provedl 14 přidání a 20 odebrání
  1. 14
    20
      src/freedombone-controlpanel

+ 14
- 20
src/freedombone-controlpanel Zobrazit soubor

@@ -2202,31 +2202,24 @@ function menu_wifi {
2202 2202
             fi
2203 2203
         fi
2204 2204
 
2205
-        data=$(mktemp 2>/dev/null)
2206
-        dialog --backtitle $"Freedombone Control Panel" \
2207
-               --title $"Wifi Menu" \
2208
-               --radiolist $"${status_str}\\n\\nChoose an operation:" 14 70 6 \
2209
-               1 $"Enable or disable Wifi" off \
2210
-               2 $"Configure wifi networks" off \
2211
-               3 $"Manually edit wifi networks file" off \
2212
-               4 $"Hotspot settings" off \
2213
-               5 $"Exit" on 2> "$data"
2214
-        sel=$?
2215
-        case $sel in
2216
-            1) rm -f "$data"
2217
-               break;;
2218
-            255) rm -f "$data"
2219
-                 break;;
2220
-        esac
2221
-        case $(cat "$data") in
2205
+        W=(1 $"Enable or disable Wifi"
2206
+           2 $"Configure wifi networks"
2207
+           3 $"Manually edit wifi networks file"
2208
+           4 $"Hotspot settings")
2209
+
2210
+        # shellcheck disable=SC2068
2211
+        selection=$(dialog --backtitle $"Freedombone Administrator Control Panel" --title $"Wifi Menu" --menu $"${status_str}\\n\\nChoose an operation, or ESC for main menu:" 14 70 6 "${W[@]}" 3>&2 2>&1 1>&3)
2212
+
2213
+        if [ ! "$selection" ]; then
2214
+            break
2215
+        fi
2216
+
2217
+        case $selection in
2222 2218
             1) wifi_enable;;
2223 2219
             2) wifi_settings;;
2224 2220
             3) wifi_edit_networks;;
2225 2221
             4) hotspot_settings;;
2226
-            5) rm -f "$data"
2227
-               break;;
2228 2222
         esac
2229
-        rm -f "$data"
2230 2223
     done
2231 2224
 }
2232 2225
 
@@ -2299,6 +2292,7 @@ function menu_top_level {
2299 2292
 
2300 2293
         # shellcheck disable=SC2068
2301 2294
         selection=$(dialog --backtitle $"Freedombone Administrator Control Panel" --title $"Administrator Control Panel" --menu $"Choose an operation, or ESC to exit:" 28 60 28 "${W[@]}" 3>&2 2>&1 1>&3)
2295
+
2302 2296
         if [ ! "$selection" ]; then
2303 2297
             break
2304 2298
         fi