mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
add brackets to km
This commit is contained in:
parent
7886b21666
commit
b7691a27ec
1 changed files with 31 additions and 31 deletions
|
@ -5,7 +5,7 @@ ANSWER="/tmp/.km"
|
|||
TITLE="Arch Linux Keymap And Console Font Setting"
|
||||
BASEDIR="/usr/share/kbd"
|
||||
|
||||
if [ "$1" = "--setup" ]; then
|
||||
if [ "${1}" = "--setup" ]; then
|
||||
EXIT="Return to Main Menu"
|
||||
else
|
||||
EXIT="Exit"
|
||||
|
@ -28,7 +28,7 @@ abort()
|
|||
# parameters: see dialog(1)
|
||||
# returns: whatever dialog did
|
||||
DIALOG() {
|
||||
dialog --backtitle "$TITLE" --aspect 15 "$@"
|
||||
dialog --backtitle "${TITLE}" --aspect 15 "$@"
|
||||
return $?
|
||||
}
|
||||
|
||||
|
@ -40,21 +40,21 @@ error_kmset()
|
|||
dokeymap() {
|
||||
echo "Scanning for keymaps..."
|
||||
KEYMAPS=
|
||||
for i in $(find $BASEDIR/keymaps -follow -name "*.gz" | sed 's|^.*/||g' | sort); do
|
||||
KEYMAPS="$KEYMAPS $i -"
|
||||
for i in $(find ${BASEDIR}/keymaps -follow -name "*.gz" | sed 's|^.*/||g' | sort); do
|
||||
KEYMAPS="${KEYMAPS} ${i} -"
|
||||
done
|
||||
CANCEL=""
|
||||
DIALOG --menu "Select A Keymap" 22 60 16 $KEYMAPS 2>$ANSWER || CANCEL="1"
|
||||
if [ "$CANCEL" = "1" ]; then
|
||||
DIALOG --menu "Select A Keymap" 22 60 16 ${KEYMAPS} 2>${ANSWER} || CANCEL="1"
|
||||
if [ "${CANCEL}" = "1" ]; then
|
||||
S_NEXTITEM="1"
|
||||
return 1
|
||||
fi
|
||||
keymap=$(cat $ANSWER)
|
||||
echo $keymap > /tmp/.keymap
|
||||
if [ "$keymap" ]; then
|
||||
DIALOG --infobox "Loading keymap: $keymap" 0 0
|
||||
#loadkeys -q $BASEDIR/keymaps/$keymap
|
||||
loadkeys -q $keymap > /dev/null 2>&1 || error_kmset
|
||||
keymap=$(cat ${ANSWER})
|
||||
echo ${keymap} > /tmp/.keymap
|
||||
if [ "${keymap}" ]; then
|
||||
DIALOG --infobox "Loading keymap: ${keymap}" 0 0
|
||||
#loadkeys -q ${BASEDIR}/keymaps/${keymap}
|
||||
loadkeys -q ${keymap} > /dev/null 2>&1 || error_kmset
|
||||
fi
|
||||
S_NEXTITEM=2
|
||||
}
|
||||
|
@ -63,43 +63,43 @@ doconsolefont() {
|
|||
echo "Scanning for fonts..."
|
||||
FONTS=
|
||||
# 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
|
||||
FONTS="$FONTS $i -"
|
||||
for i in $(find ${BASEDIR}/consolefonts -maxdepth 1 ! -name '*.cp.gz' -name "*.gz" | sed 's|^.*/||g' | sort); do
|
||||
FONTS="${FONTS} ${i} -"
|
||||
done
|
||||
CANCEL=""
|
||||
DIALOG --menu "Select A Console Font" 22 60 16 $FONTS 2>$ANSWER || CANCEL=1
|
||||
if [ "$CANCEL" = "1" ]; then
|
||||
DIALOG --menu "Select A Console Font" 22 60 16 ${FONTS} 2>${ANSWER} || CANCEL=1
|
||||
if [ "${CANCEL}" = "1" ]; then
|
||||
S_NEXTITEM="2"
|
||||
return 1
|
||||
fi
|
||||
font=$(cat $ANSWER)
|
||||
echo $font > /tmp/.font
|
||||
if [ "$font" ]; then
|
||||
DIALOG --infobox "Loading font: $font" 0 0
|
||||
font=$(cat ${ANSWER})
|
||||
echo ${font} > /tmp/.font
|
||||
if [ "${font}" ]; then
|
||||
DIALOG --infobox "Loading font: ${font}" 0 0
|
||||
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
|
||||
# set serial console if used too!
|
||||
if [ "$(tty | grep /dev/ttyS)" ]; then
|
||||
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
|
||||
S_NEXTITEM=3
|
||||
}
|
||||
|
||||
mainmenu() {
|
||||
if [ -n "$S_NEXTITEM" ]; then
|
||||
DEFAULT="--default-item $S_NEXTITEM"
|
||||
if [ -n "${S_NEXTITEM}" ]; then
|
||||
DEFAULT="--default-item ${S_NEXTITEM}"
|
||||
else
|
||||
DEFAULT=""
|
||||
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 \
|
||||
"1" "Set Keymap" \
|
||||
"2" "Set Consolefont" \
|
||||
"3" "$EXIT" 2>$ANSWER
|
||||
case $(cat $ANSWER) in
|
||||
"3" "${EXIT}" 2>${ANSWER}
|
||||
case $(cat ${ANSWER}) in
|
||||
"1")
|
||||
dokeymap
|
||||
;;
|
||||
|
@ -119,13 +119,13 @@ mainmenu() {
|
|||
: >/tmp/.font
|
||||
: >/tmp/.km
|
||||
|
||||
if [ ! -d $BASEDIR/keymaps ]; then
|
||||
echo "Cannot load keymaps, as none were found in $BASEDIR/keymaps" >&2
|
||||
if [ ! -d ${BASEDIR}/keymaps ]; then
|
||||
echo "Cannot load keymaps, as none were found in ${BASEDIR}/keymaps" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d $BASEDIR/consolefonts ]; then
|
||||
echo "Cannot load consolefonts, as none were found in $BASEDIR/consolefonts" >&2
|
||||
if [ ! -d ${BASEDIR}/consolefonts ]; then
|
||||
echo "Cannot load consolefonts, as none were found in ${BASEDIR}/consolefonts" >&2
|
||||
fi
|
||||
|
||||
if [ ! $(which loadkeys) ]; then
|
||||
|
|
Loading…
Reference in a new issue