From 6902cfb2ab8c1ccf96de0f3423742fe93be31425 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Mon, 13 May 2019 17:17:21 -0300
Subject: [PATCH] archive: dragora-tools: dragora-keymap: minor adjustments,
 fixes

---
 archive/dragora-tools/dragora-keymap | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/archive/dragora-tools/dragora-keymap b/archive/dragora-tools/dragora-keymap
index 774a424c..0a92e77c 100644
--- a/archive/dragora-tools/dragora-keymap
+++ b/archive/dragora-tools/dragora-keymap
@@ -56,7 +56,7 @@ then
 fi
 if test ! -d "$KEYMAPS"
 then
-    echo "${PROGRAM}: \`${KEYMAPS}' the specified directory is not valid" 1>&2
+    echo "${PROGRAM}: Directory \`${KEYMAPS}' for keyboard maps does not exist as such" 1>&2
     exit 1;
 fi
 
@@ -96,12 +96,12 @@ fi
 # Header
 printf "%s\n" \
  'dialog --colors \'                                            \
- ' --backtitle "\Zb${PROGRAM} - Keyboard map configuration" \'  \
- ' --title "MAIN MENU" --menu \'                                \
- '"Welcome to \Zb${PROGRAM}\Zn!\n\n\'                           \
- 'The following menu list is organized as \n\'                  \
- 'keyboard \"layout/language\". \n\n\'                          \
- 'Select a keyboard map for the console:" 19 56 10 \'           \
+ ' --backtitle "\Zb${PROGRAM} - Keyboard map selection" \'      \
+ ' --title "KEYMAPS" --default-item "qwerty/us" --menu \'       \
+ '"Welcome to \Zb\Z7${PROGRAM}\Zn!\n\n\'                        \
+ 'The following menu list is organized as keyboard \n\'         \
+ '\"layout/language\". \n\n\'                                   \
+ 'Select a keyboard map for the console:" 24 56 12 \'           \
  > $OUTPUT
 
 # Append 'search' to the body
@@ -157,19 +157,20 @@ do
     testkeys="$(
      dialog --colors \
       --no-mouse --no-cancel --no-ok \
-      --backtitle "\Zb${PROGRAM} - Keymap test" \
-      --title "TEST" --hline "${layout}/$map" \
+      --backtitle "\Zb${PROGRAM} - Keyboard map test" \
+      --title "SELECTED KEYMAP: ${layout}/$map" \
       --inputbox "Try the chosen keyboard map by typing something.\n\n\
-Once satisfied type \"\Zb1\ZB\" (or \Zby\ZB) and press \ZbENTER\ZB. \n\
-Type \"\Zb2\ZB\" (or \Zbn\ZB) plus \ZbENTER\ZB to choose a different
-keyboard map." 12 56 2>&1 > /dev/tty
+Once satisfied type \Zb\Z71\Zn (or \Zb\Z7y\Zn) then press \Zb\Z7ENTER\Zn \
+to continue. \nYou can type \Zb\Z72\Zn (or \Zb\Z7n\Zn) plus \
+\Zb\Z7ENTER\Zn to choose a different keyboard map." 12 63 2>&1 > /dev/tty
     )"
+
     case $testkeys in
     1 | Y | y)
         break
         ;;
     2 | N | n)
-        rm -- "$LOCKFILE"
+        rm -f -- "$LOCKFILE"
         exec "$0"
         ;;
     esac
-- 
2.11.4.GIT