X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-quickconfig;h=9da12b0e07517299fe299c2e551ca623170d07c4;hb=refs%2Fheads%2Fmaster;hp=78044c4bdb19356bafe471cafc30499b0dd68bd4;hpb=3b6455afea9e1490f0e074f664fa6b2472a3ffd7;p=grml-quickconfig.git

diff --git a/grml-quickconfig b/grml-quickconfig
index 78044c4..9da12b0 100755
--- a/grml-quickconfig
+++ b/grml-quickconfig
@@ -80,7 +80,7 @@ run() {
 }
 
 get_key() {
-    stty -echo ; read -kq ${1}?"Press a key: "
+    stty -echo ; read -k ${1}?"Press a key: "
 }
 
 bailout() {
@@ -110,7 +110,12 @@ if [ -n "$1" ] ; then
 fi
 
 if [ -z "$MENUDIR" ] ; then
-   MENUDIR="$SCRIPTDIR"
+   if [ -d "$SCRIPTDIR/local" ] ; then
+      MENUDIR="$SCRIPTDIR/local"
+
+   else
+      MENUDIR="$SCRIPTDIR"
+   fi
 fi
 
 # }}}
@@ -129,6 +134,9 @@ for file in ${MENUDIR}/*.sh ; do
     if display_entry ; then
         setopt noglob
         if [ -n "$LINE" ] ; then
+           LINE=$(echo "$LINE" | sed 's#\([^\]\)/\([[:alnum:]_-]*\)/#\1${HIGHLIGHT_NAME}\2${NORMAL}#g')
+           LINE=$(echo "$LINE" | sed 's#\([^\]\)^\([[:alnum:]]\)#\1${HIGHLIGHT}\2${NORMAL}#g')
+           LINE=$(echo "$LINE" | sed 's#\\\([^/]\)#\1#g')
             info+="$(eval $LINE)"
         fi
 
@@ -151,13 +159,18 @@ while : ; do
     echo
     get_key INPUT
     case $INPUT in
-        [q|Q|$'\n'])
+        [qQ$'\n'])
+            echo $INPUT
+            break
+            ;;
+        [rR])
             echo $INPUT
+            exec grml-quickconfig
             break
             ;;
         [${(k)keys}])
             echo $INPUT
-            eval ${keymap[$INPUT]}
+            eval ${keymap[$INPUT]} || true
             ;;
         *)
             echo "Unknown key"
@@ -167,7 +180,6 @@ while : ; do
         esac
 
 done
-echo "Happy Hacking"
 # }}}
 
 ## END OF FILE #################################################################