Bläddra i källkod

keyserver configuration menu style

Bob Mottram 7 år sedan
förälder
incheckning
d48edfc5f5
1 ändrade filer med 12 tillägg och 19 borttagningar
  1. 12
    19
      src/freedombone-app-keyserver

+ 12
- 19
src/freedombone-app-keyserver Visa fil

@@ -531,31 +531,24 @@ function keyserver_remove_key {
531 531
 }
532 532
 
533 533
 function configure_interactive_keyserver {
534
+    W=(1 $"Remove a key"
535
+       2 $"Sync with other keyserver"
536
+       3 $"Edit sync keyservers")
537
+
534 538
     while true
535 539
     do
536
-        data=$(mktemp 2>/dev/null)
537
-        dialog --backtitle $"Freedombone Control Panel" \
538
-               --title $"SKS Keyserver" \
539
-               --radiolist $"Choose an operation:" 12 70 4 \
540
-               1 $"Remove a key" off \
541
-               2 $"Sync with other keyserver" off \
542
-               3 $"Edit sync keyservers" off \
543
-               4 $"Exit" on 2> "$data"
544
-        sel=$?
545
-        case $sel in
546
-            1) rm -f "$data"
547
-               return;;
548
-            255) rm -f "$data"
549
-                 return;;
550
-        esac
551
-        case $(cat "$data") in
540
+        # shellcheck disable=SC2068
541
+        selection=$(dialog --backtitle $"Freedombone Administrator Control Panel" --title $"SKS Keyserver" --menu $"Choose an operation, or ESC to exit:" 11 60 3 "${W[@]}" 3>&2 2>&1 1>&3)
542
+
543
+        if [ ! "$selection" ]; then
544
+            break
545
+        fi
546
+
547
+        case $selection in
552 548
             1) keyserver_remove_key;;
553 549
             2) keyserver_sync;;
554 550
             3) keyserver_edit;;
555
-            4) rm -f "$data"
556
-               break;;
557 551
         esac
558
-        rm -f "$data"
559 552
     done
560 553
 }
561 554