You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
85 lines
2.9 KiB
85 lines
2.9 KiB
From 380a3b2b2d38f08ac84d3ac521b205960059d99c Mon Sep 17 00:00:00 2001 |
|
From: Yu Watanabe <watanabe.yu+github@gmail.com> |
|
Date: Tue, 14 Jun 2022 09:10:00 +0900 |
|
Subject: [PATCH] test: add one more path to search keymaps |
|
|
|
Now it also supports split-usr. |
|
|
|
(cherry picked from commit 569c6fd1b7c7946fa853d558fcbb23e4a45f957f) |
|
|
|
Related: #2087652 |
|
--- |
|
test/test-functions | 59 ++++++++++++++++++++++++++++++--------------- |
|
1 file changed, 40 insertions(+), 19 deletions(-) |
|
|
|
diff --git a/test/test-functions b/test/test-functions |
|
index d71e2a3328..01fc90fbf5 100644 |
|
--- a/test/test-functions |
|
+++ b/test/test-functions |
|
@@ -1844,26 +1844,47 @@ install_pam() { |
|
|
|
# shellcheck disable=SC2120 |
|
install_keymaps() { |
|
- dinfo "Install keymaps" |
|
- # The first three paths may be deprecated. |
|
- # It seems now the last two paths are used by many distributions. |
|
- for i in \ |
|
- /usr/lib/kbd/keymaps/include/* \ |
|
- /usr/lib/kbd/keymaps/i386/include/* \ |
|
- /usr/lib/kbd/keymaps/i386/qwerty/us.* \ |
|
- /usr/lib/kbd/keymaps/legacy/include/* \ |
|
- /usr/lib/kbd/keymaps/legacy/i386/qwerty/us.*; do |
|
- [[ -f "$i" ]] || continue |
|
- inst "$i" |
|
- done |
|
+ local i p |
|
+ local -a prefix=( |
|
+ "/usr" |
|
+ ) |
|
|
|
- # When it takes any argument, then install more keymaps. |
|
- if [[ $# -gt 1 ]]; then |
|
- for i in \ |
|
- /usr/lib/kbd/keymaps/i386/*/* \ |
|
- /usr/lib/kbd/keymaps/legacy/i386/*/*; do |
|
- [[ -f "$i" ]] || continue |
|
- inst "$i" |
|
+ dinfo "Install console keymaps" |
|
+ |
|
+ if command -v meson >/dev/null \ |
|
+ && [[ "$(meson configure "${BUILD_DIR:?}" | grep 'split-usr' | awk '{ print $2 }')" == "true" ]] \ |
|
+ || [[ ! -L /lib ]]; then |
|
+ prefix+=( |
|
+ "" |
|
+ ) |
|
+ fi |
|
+ |
|
+ if (( $# == 0 )); then |
|
+ for p in "${prefix[@]}"; do |
|
+ # 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 |
|
+ [[ -f "$i" ]] || continue |
|
+ inst "$i" |
|
+ done |
|
+ done |
|
+ else |
|
+ # 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 |
|
+ [[ -f "$i" ]] || continue |
|
+ inst "$i" |
|
+ done |
|
done |
|
fi |
|
}
|
|
|