From 64cc61f8747c958bd13b8fcf7f78274dc2241182 Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Sun, 31 Jan 2010 01:16:12 +0100 Subject: [PATCH] Fixed some typos --- grml-quickconfig | 8 ++++---- grml-quickconfig.8 | 8 ++++---- quickconfig/001-heading.sh | 2 +- quickconfig/005-language.sh | 4 ++-- quickconfig/010-network.sh | 2 +- quickconfig/015-netcardconfig.sh | 2 +- quickconfig/025-info.sh | 2 +- quickconfig/030-wm.sh | 4 ++-- quickconfig/035-menu.sh | 2 +- quickconfig/040-grml2hd.sh | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/grml-quickconfig b/grml-quickconfig index 52a22ac..5ac4e0a 100755 --- a/grml-quickconfig +++ b/grml-quickconfig @@ -25,8 +25,8 @@ typeset -A keymap HLINE="$B x $N" VLINE=$(repeat $MAXLEN echo -n q) -HILIGHT="$GREEN" -HILIGHT_NAME="$MAGENTA" +HIGHLIGHT="$GREEN" +HIGHLIGHT_NAME="$MAGENTA" SCRIPTDIR="/usr/share/grml-quickconfig/" @@ -56,8 +56,8 @@ print_delim() { echo $B ${BLUE}t"$VLINE"u${NORMAL} $N } -hilight_char() { - echo $1 | sed -e "s/$2/$HILIGHT$2$NORMAL/" +highlight_char() { + echo $1 | sed -e "s/$2/$HIGHLIGHT$2$NORMAL/" } print_menu() { diff --git a/grml-quickconfig.8 b/grml-quickconfig.8 index ca0cac8..7641930 100644 --- a/grml-quickconfig.8 +++ b/grml-quickconfig.8 @@ -80,7 +80,7 @@ Switch back to normal color Highlight the used key inside the menu. .TP .B Example - print_line "Configure ${HILIGHT}n${NORMAL}etwork" + print_line "Configure ${HIGHLIGHT}n${NORMAL}etwork" .SS MUST Provide .TP .B display_entry @@ -108,7 +108,7 @@ used in combination with print_line. Only used if display_entry returns 0. .RS .B \ Example # print Configure network (grml-network) - LINE='print_line "Configure ${HILIGHT}n${NORMAL}etwork (${HILIGHT_NAME}grml-network${NORMAL})"' + LINE='print_line "Configure ${HIGHLIGHT}n${NORMAL}etwork (${HIGHLIGHT_NAME}grml-network${NORMAL})"' .RE 1 .SS Optional entries The following variables are optional and can be defined in a script but do not have to. @@ -135,8 +135,8 @@ KEY=(c d e) .SS Complete Example # language module for grml-quickconfig - LINE='print_line "Set keyboard layout (${HILIGHT_NAME}grml-lang${NORMAL}): \\ - ${HILIGHT}d${NORMAL}e ${HILIGHT}a${NORMAL}t ${HILIGHT}c${NORMAL}h e${HILIGHT}s${NORMAL} ${HILIGHT}u${NORMAL}s"' + LINE='print_line "Set keyboard layout (${HIGHLIGHT_NAME}grml-lang${NORMAL}): \\ + ${HIGHLIGHT}d${NORMAL}e ${HIGHLIGHT}a${NORMAL}t ${HIGHLIGHT}c${NORMAL}h e${HIGHLIGHT}s${NORMAL} ${HIGHLIGHT}u${NORMAL}s"' typeset -A lang_mapping diff --git a/quickconfig/001-heading.sh b/quickconfig/001-heading.sh index 2b9fe82..1f5647a 100644 --- a/quickconfig/001-heading.sh +++ b/quickconfig/001-heading.sh @@ -2,7 +2,7 @@ # print the heading LINE='print_line "Welcome to grml-quickconfig"; print_line "Press a highlighted key to perform an action, or press"; -print_line "${HILIGHT}Return${NORMAL} or ${HILIGHT}q${NORMAL} to go back to the shell."; +print_line "${HIGHLIGHT}Return${NORMAL} or ${HIGHLIGHT}q${NORMAL} to go back to the shell."; print_delim; ' diff --git a/quickconfig/005-language.sh b/quickconfig/005-language.sh index daf21be..4548960 100644 --- a/quickconfig/005-language.sh +++ b/quickconfig/005-language.sh @@ -1,6 +1,6 @@ # language module for grml-quickconfig -LINE='print_line "Set keyboard layout (${HILIGHT_NAME}grml-lang${NORMAL}): \ -${HILIGHT}d${NORMAL}e ${HILIGHT}a${NORMAL}t ${HILIGHT}c${NORMAL}h e${HILIGHT}s${NORMAL} ${HILIGHT}u${NORMAL}s"' +LINE='print_line "Set keyboard layout (${HIGHLIGHT_NAME}grml-lang${NORMAL}): \ +${HIGHLIGHT}d${NORMAL}e ${HIGHLIGHT}a${NORMAL}t ${HIGHLIGHT}c${NORMAL}h e${HIGHLIGHT}s${NORMAL} ${HIGHLIGHT}u${NORMAL}s"' typeset -A lang_mapping diff --git a/quickconfig/010-network.sh b/quickconfig/010-network.sh index e1efa25..76e3cd3 100644 --- a/quickconfig/010-network.sh +++ b/quickconfig/010-network.sh @@ -1,5 +1,5 @@ # grml-network module for grml-quickconfig -LINE='print_line "Configure ${HILIGHT}n${NORMAL}etwork (${HILIGHT_NAME}grml-network${NORMAL})"' +LINE='print_line "Configure ${HIGHLIGHT}n${NORMAL}etwork (${HIGHLIGHT_NAME}grml-network${NORMAL})"' KEY=(n) FUNCTION='run grml-network' diff --git a/quickconfig/015-netcardconfig.sh b/quickconfig/015-netcardconfig.sh index 2da0ed3..e1ec01d 100644 --- a/quickconfig/015-netcardconfig.sh +++ b/quickconfig/015-netcardconfig.sh @@ -1,5 +1,5 @@ # netcardconfig module for grml-quickconfig -LINE='print_line "-> Configure ${HILIGHT}e${NORMAL}thernet card directly (${HILIGHT_NAME}netcardconfig${NORMAL})"' +LINE='print_line "-> Configure ${HIGHLIGHT}e${NORMAL}thernet card directly (${HIGHLIGHT_NAME}netcardconfig${NORMAL})"' KEY=(n) FUNCTION='run netcardconfig' diff --git a/quickconfig/025-info.sh b/quickconfig/025-info.sh index b550bc6..33533f9 100644 --- a/quickconfig/025-info.sh +++ b/quickconfig/025-info.sh @@ -1,5 +1,5 @@ # grml-info module for grml-quickconfig -LINE='print_line "Show ${HILIGHT}i${NORMAL}nformation about grml (${HILIGHT_NAME}grml-info${NORMAL})"' +LINE='print_line "Show ${HIGHLIGHT}i${NORMAL}nformation about grml (${HIGHLIGHT_NAME}grml-info${NORMAL})"' KEY=(i) FUNCTION="run grml-info" diff --git a/quickconfig/030-wm.sh b/quickconfig/030-wm.sh index 31bcbf4..be376ed 100644 --- a/quickconfig/030-wm.sh +++ b/quickconfig/030-wm.sh @@ -1,5 +1,5 @@ # window manager module for grml-quickconfig -LINE='print_line "Start ${HILIGHT}x${NORMAL} (${HILIGHT_NAME}grml-x${NORMAL})"' +LINE='print_line "Start ${HIGHLIGHT}x${NORMAL} (${HIGHLIGHT_NAME}grml-x${NORMAL})"' KEY=(x) FUNCTION='wm_menu' @@ -44,7 +44,7 @@ print_available_wm() { # test if word could be added to current line if [ $[${(c)#key} + $LEN] -lt $MAXLEN ] ; then LEN+=${(c)#wm} - line+="$(hilight_char $value $key) " + line+="$(highlight_char $value $key) " else LEN=0 output+="$line" diff --git a/quickconfig/035-menu.sh b/quickconfig/035-menu.sh index 6e48b23..9987b46 100644 --- a/quickconfig/035-menu.sh +++ b/quickconfig/035-menu.sh @@ -1,6 +1,6 @@ # application menu module for grml-quickconfig -LINE='print_line "Show an application ${HILIGHT}m${NORMAL}enu (${HILIGHT_NAME}pdmenu${NORMAL})"' +LINE='print_line "Show an application ${HIGHLIGHT}m${NORMAL}enu (${HIGHLIGHT_NAME}pdmenu${NORMAL})"' KEY=(m) MENU_PROGNAME=pdmenu FUNCTION="run $MENU_PROGNAME" diff --git a/quickconfig/040-grml2hd.sh b/quickconfig/040-grml2hd.sh index f30deaa..745663e 100644 --- a/quickconfig/040-grml2hd.sh +++ b/quickconfig/040-grml2hd.sh @@ -1,4 +1,4 @@ -LINE='print_line "Install grml to ${HILIGHT}h${NORMAL}ard disk (${HILIGHT_NAME}grml2hd${NORMAL}"' +LINE='print_line "Install grml to ${HIGHLIGHT}h${NORMAL}ard disk (${HIGHLIGHT_NAME}grml2hd${NORMAL}"' KEY=(m) HD_APP=grml2hd FUNCTION="run $HD_APP" -- 2.1.4