add brackets to km

This commit is contained in:
Tobias Powalowski 2011-02-04 18:13:06 +01:00
parent 7886b21666
commit b7691a27ec

View file

@ -5,7 +5,7 @@ ANSWER="/tmp/.km"
TITLE="Arch Linux Keymap And Console Font Setting" TITLE="Arch Linux Keymap And Console Font Setting"
BASEDIR="/usr/share/kbd" BASEDIR="/usr/share/kbd"
if [ "$1" = "--setup" ]; then if [ "${1}" = "--setup" ]; then
EXIT="Return to Main Menu" EXIT="Return to Main Menu"
else else
EXIT="Exit" EXIT="Exit"
@ -28,7 +28,7 @@ abort()
# parameters: see dialog(1) # parameters: see dialog(1)
# returns: whatever dialog did # returns: whatever dialog did
DIALOG() { DIALOG() {
dialog --backtitle "$TITLE" --aspect 15 "$@" dialog --backtitle "${TITLE}" --aspect 15 "$@"
return $? return $?
} }
@ -40,21 +40,21 @@ error_kmset()
dokeymap() { dokeymap() {
echo "Scanning for keymaps..." echo "Scanning for keymaps..."
KEYMAPS= KEYMAPS=
for i in $(find $BASEDIR/keymaps -follow -name "*.gz" | sed 's|^.*/||g' | sort); do for i in $(find ${BASEDIR}/keymaps -follow -name "*.gz" | sed 's|^.*/||g' | sort); do
KEYMAPS="$KEYMAPS $i -" KEYMAPS="${KEYMAPS} ${i} -"
done done
CANCEL="" CANCEL=""
DIALOG --menu "Select A Keymap" 22 60 16 $KEYMAPS 2>$ANSWER || CANCEL="1" DIALOG --menu "Select A Keymap" 22 60 16 ${KEYMAPS} 2>${ANSWER} || CANCEL="1"
if [ "$CANCEL" = "1" ]; then if [ "${CANCEL}" = "1" ]; then
S_NEXTITEM="1" S_NEXTITEM="1"
return 1 return 1
fi fi
keymap=$(cat $ANSWER) keymap=$(cat ${ANSWER})
echo $keymap > /tmp/.keymap echo ${keymap} > /tmp/.keymap
if [ "$keymap" ]; then if [ "${keymap}" ]; then
DIALOG --infobox "Loading keymap: $keymap" 0 0 DIALOG --infobox "Loading keymap: ${keymap}" 0 0
#loadkeys -q $BASEDIR/keymaps/$keymap #loadkeys -q ${BASEDIR}/keymaps/${keymap}
loadkeys -q $keymap > /dev/null 2>&1 || error_kmset loadkeys -q ${keymap} > /dev/null 2>&1 || error_kmset
fi fi
S_NEXTITEM=2 S_NEXTITEM=2
} }
@ -63,43 +63,43 @@ doconsolefont() {
echo "Scanning for fonts..." echo "Scanning for fonts..."
FONTS= FONTS=
# skip .cp.gz and partialfonts files for now see bug #6112, #6111 # skip .cp.gz and partialfonts files for now see bug #6112, #6111
for i in $(find $BASEDIR/consolefonts -maxdepth 1 ! -name '*.cp.gz' -name "*.gz" | sed 's|^.*/||g' | sort); do for i in $(find ${BASEDIR}/consolefonts -maxdepth 1 ! -name '*.cp.gz' -name "*.gz" | sed 's|^.*/||g' | sort); do
FONTS="$FONTS $i -" FONTS="${FONTS} ${i} -"
done done
CANCEL="" CANCEL=""
DIALOG --menu "Select A Console Font" 22 60 16 $FONTS 2>$ANSWER || CANCEL=1 DIALOG --menu "Select A Console Font" 22 60 16 ${FONTS} 2>${ANSWER} || CANCEL=1
if [ "$CANCEL" = "1" ]; then if [ "${CANCEL}" = "1" ]; then
S_NEXTITEM="2" S_NEXTITEM="2"
return 1 return 1
fi fi
font=$(cat $ANSWER) font=$(cat ${ANSWER})
echo $font > /tmp/.font echo ${font} > /tmp/.font
if [ "$font" ]; then if [ "${font}" ]; then
DIALOG --infobox "Loading font: $font" 0 0 DIALOG --infobox "Loading font: ${font}" 0 0
for i in $(seq 1 6); do for i in $(seq 1 6); do
setfont $BASEDIR/consolefonts/$font -C /dev/tty${i} > /dev/null 2>&1 setfont ${BASEDIR}/consolefonts/${font} -C /dev/tty${i} > /dev/null 2>&1
done done
# set serial console if used too! # set serial console if used too!
if [ "$(tty | grep /dev/ttyS)" ]; then if [ "$(tty | grep /dev/ttyS)" ]; then
SERIAL="$(tty)" SERIAL="$(tty)"
setfont $BASEDIR/consolefonts/$font -C /dev/$SERIAL > /dev/null 2>&1 setfont ${BASEDIR}/consolefonts/${font} -C /dev/${SERIAL} > /dev/null 2>&1
fi fi
fi fi
S_NEXTITEM=3 S_NEXTITEM=3
} }
mainmenu() { mainmenu() {
if [ -n "$S_NEXTITEM" ]; then if [ -n "${S_NEXTITEM}" ]; then
DEFAULT="--default-item $S_NEXTITEM" DEFAULT="--default-item ${S_NEXTITEM}"
else else
DEFAULT="" DEFAULT=""
fi fi
DIALOG $DEFAULT --backtitle "$TITLE" --title " MAIN MENU " \ DIALOG ${DEFAULT} --backtitle "${TITLE}" --title " MAIN MENU " \
--menu "Use the UP and DOWN arrows to navigate menus.\nUse TAB to switch between buttons and ENTER to select." 17 58 13 \ --menu "Use the UP and DOWN arrows to navigate menus.\nUse TAB to switch between buttons and ENTER to select." 17 58 13 \
"1" "Set Keymap" \ "1" "Set Keymap" \
"2" "Set Consolefont" \ "2" "Set Consolefont" \
"3" "$EXIT" 2>$ANSWER "3" "${EXIT}" 2>${ANSWER}
case $(cat $ANSWER) in case $(cat ${ANSWER}) in
"1") "1")
dokeymap dokeymap
;; ;;
@ -119,13 +119,13 @@ mainmenu() {
: >/tmp/.font : >/tmp/.font
: >/tmp/.km : >/tmp/.km
if [ ! -d $BASEDIR/keymaps ]; then if [ ! -d ${BASEDIR}/keymaps ]; then
echo "Cannot load keymaps, as none were found in $BASEDIR/keymaps" >&2 echo "Cannot load keymaps, as none were found in ${BASEDIR}/keymaps" >&2
exit 1 exit 1
fi fi
if [ ! -d $BASEDIR/consolefonts ]; then if [ ! -d ${BASEDIR}/consolefonts ]; then
echo "Cannot load consolefonts, as none were found in $BASEDIR/consolefonts" >&2 echo "Cannot load consolefonts, as none were found in ${BASEDIR}/consolefonts" >&2
fi fi
if [ ! $(which loadkeys) ]; then if [ ! $(which loadkeys) ]; then