Преглед на файлове

vpn configuration menu style

Bob Mottram преди 7 години
родител
ревизия
6fd1d1a5ed
променени са 1 файла, в които са добавени 11 реда и са изтрити 18 реда
  1. 11
    18
      src/freedombone-app-vpn

+ 11
- 18
src/freedombone-app-vpn Целия файл

@@ -201,27 +201,20 @@ function configure_interactive_vpn {
201 201
     read_config_param VPN_TLS_PORT
202 202
     while true
203 203
     do
204
-        data=$(mktemp 2>/dev/null)
205
-        dialog --backtitle $"Freedombone Control Panel" \
206
-               --title $"VPN Configuration" \
207
-               --radiolist $"Choose an operation:" 13 70 3 \
208
-               1 $"Change TLS port (currently $VPN_TLS_PORT)" off \
209
-               2 $"Regenerate keys for a user" off \
210
-               3 $"Exit" on 2> "$data"
211
-        sel=$?
212
-        case $sel in
213
-            1) rm -f "$data"
214
-               return;;
215
-            255) rm -f "$data"
216
-                 return;;
217
-        esac
218
-        case $(cat "$data") in
204
+        W=(1 $"Change TLS port (currently $VPN_TLS_PORT)"
205
+           2 $"Regenerate keys for a user")
206
+
207
+        # shellcheck disable=SC2068
208
+        selection=$(dialog --backtitle $"Freedombone Administrator Control Panel" --title $"VPN" --menu $"Choose an operation, or ESC to exit:" 10 60 2 "${W[@]}" 3>&2 2>&1 1>&3)
209
+
210
+        if [ ! "$selection" ]; then
211
+            break
212
+        fi
213
+
214
+        case $selection in
219 215
             1) vpn_change_tls_port;;
220 216
             2) vpn_regenerate_client_keys;;
221
-            3) rm -f "$data"
222
-               break;;
223 217
         esac
224
-        rm -f "$data"
225 218
     done
226 219
 }
227 220