shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

test: fix keymaps installation on Arch

Browse Source 
Where the keymaps live under /usr/share/kbd/keymaps/.
This commit is contained in:
Frantisek Sumsal 2022-11-07 12:07:27 +01:00
parent 0c416ea01b
commit 1edad89399
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/test-functions
View File

@ -2007,7 +2007,8 @@ install_locales() {
install_keymaps() {
local i p
local -a prefix=(
"/usr"
"/usr/lib"
"/usr/share"
)
dinfo "Install console keymaps"
@ -2016,7 +2017,7 @@ install_keymaps() {
&& [[ "$(meson configure "${BUILD_DIR:?}" | grep 'split-usr' | awk '{ print $2 }')" == "true" ]] \
|| [[ ! -L /lib ]]; then
prefix+=(
""
"/lib"
)
fi
@ -2025,12 +2026,12 @@ install_keymaps() {
# The first three paths may be deprecated.
# It seems now the last three paths are used by many distributions.
for i in \
"$p"/lib/kbd/keymaps/include/* \
"$p"/lib/kbd/keymaps/i386/include/* \
"$p"/lib/kbd/keymaps/i386/qwerty/us.* \
"$p"/lib/kbd/keymaps/legacy/include/* \
"$p"/lib/kbd/keymaps/legacy/i386/qwerty/us.* \
"$p"/lib/kbd/keymaps/xkb/us*; do
"$p"/kbd/keymaps/include/* \
"$p"/kbd/keymaps/i386/include/* \
"$p"/kbd/keymaps/i386/qwerty/us.* \
"$p"/kbd/keymaps/legacy/include/* \
"$p"/kbd/keymaps/legacy/i386/qwerty/us.* \
"$p"/kbd/keymaps/xkb/us*; do
[[ -f "$i" ]] || continue
inst "$i"
done
@ -2039,10 +2040,10 @@ install_keymaps() {
# When it takes any argument, then install more keymaps.
for p in "${prefix[@]}"; do
for i in \
"$p"/lib/kbd/keymaps/include/* \
"$p"/lib/kbd/keymaps/i386/*/* \
"$p"/lib/kbd/keymaps/legacy/i386/*/* \
"$p"/lib/kbd/keymaps/xkb/*; do
"$p"/kbd/keymaps/include/* \
"$p"/kbd/keymaps/i386/*/* \
"$p"/kbd/keymaps/legacy/i386/*/* \
"$p"/kbd/keymaps/xkb/*; do
[[ -f "$i" ]] || continue
inst "$i"
done