RomanNum3ral
/
quickemu
mirror of https://github.com/quickemu-project/quickemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: clean up keyboard_layout variables

This commit is contained in:
Martin Wimpress 2024-05-12 23:54:34 +01:00 committed by Martin Wimpress
parent 10ccf892cd
commit 4b3cb8ac0d
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
quickemu
View File

@ -1031,9 +1031,8 @@ function vm_boot() {
# setup keyboard_layout # setup keyboard_layout
# @INFO: When using the VNC display, you must use the -k parameter to set the keyboard layout if you are not using en-us. # @INFO: When using the VNC display, you must use the -k parameter to set the keyboard layout if you are not using en-us.
[ -z "${KEYBOARD_LAYOUT}" ] && KEYBOARD_LAYOUT="$keyboard_layout" if [ -n "${keyboard_layout}" ]; then
if [ -n "${KEYBOARD_LAYOUT}" ]; then args+=(-k "${keyboard_layout}")
args+=(-k "${KEYBOARD_LAYOUT}")
fi fi
# FIXME: Check for device availability. qemu will fail to start otherwise # FIXME: Check for device availability. qemu will fail to start otherwise
@ -1419,7 +1418,7 @@ function usage() {
echo " --serial-telnet-host <ip/host> : Set telnet host for serial. (default: 'localhost')" echo " --serial-telnet-host <ip/host> : Set telnet host for serial. (default: 'localhost')"
echo " --serial-telnet-port <port> : Set telnet port for serial. (default: '6660')" echo " --serial-telnet-port <port> : Set telnet port for serial. (default: '6660')"
echo " --keyboard <type> : Set keyboard. @Options: 'usb' (default), 'ps2', 'virtio'" echo " --keyboard <type> : Set keyboard. @Options: 'usb' (default), 'ps2', 'virtio'"
echo " --keyboard_layout <layout> : Set keyboard layout." echo " --keyboard_layout <layout> : Set keyboard layout: 'en-us' (default)"
echo " --mouse <type> : Set mouse. @Options: 'tablet' (default), 'ps2', 'usb', 'virtio'" echo " --mouse <type> : Set mouse. @Options: 'tablet' (default), 'ps2', 'usb', 'virtio'"
echo " --usb-controller <type> : Set usb-controller. @Options: 'ehci' (default), 'xhci', 'none'" echo " --usb-controller <type> : Set usb-controller. @Options: 'ehci' (default), 'xhci', 'none'"
echo " --sound-card <type> : Set sound card. @Options: 'intel-hda' (default), 'ac97', 'es1370', 'sb16', 'none'" echo " --sound-card <type> : Set sound card. @Options: 'intel-hda' (default), 'ac97', 'es1370', 'sb16', 'none'"
@ -1562,7 +1561,7 @@ serial_telnet_host="localhost"
usb_controller="${usb_controller:-ehci}" usb_controller="${usb_controller:-ehci}"
# options: ps2, usb, virtio # options: ps2, usb, virtio
keyboard="${keyboard:-usb}" keyboard="${keyboard:-usb}"
keyboard_layout="en-us" keyboard_layout="${keyboard_layout:-en-us}"
# options: ps2, usb, tablet, virtio # options: ps2, usb, tablet, virtio
mouse="${mouse:-tablet}" mouse="${mouse:-tablet}"
# options: intel-hda, ac97, es1370, sb16, none # options: intel-hda, ac97, es1370, sb16, none
@ -1600,7 +1599,6 @@ VM_SERIAL_SOCKETPATH=""
SERIAL="" SERIAL=""
SERIAL_TELNET_PORT="" SERIAL_TELNET_PORT=""
SERIAL_TELNET_HOST="" SERIAL_TELNET_HOST=""
KEYBOARD_LAYOUT=""
# shellcheck disable=SC2155 # shellcheck disable=SC2155
readonly LAUNCHER=$(basename "${0}") readonly LAUNCHER=$(basename "${0}")
@ -1739,9 +1737,8 @@ else
keyboard="${2}" keyboard="${2}"
shift 2;; shift 2;;
-keyboard_layout|--keyboard_layout) -keyboard_layout|--keyboard_layout)
KEYBOARD_LAYOUT="${2}" keyboard_layout="${2}"
shift; shift 2;;
shift;;
-mouse|--mouse) -mouse|--mouse)
mouse="${2}" mouse="${2}"
shift 2;; shift 2;;