@@ -22,7 +22,7 @@ install() {
22
22
[[ -f " $dracutsysrootdir " /etc/vconsole.conf ]] && . " $dracutsysrootdir " /etc/vconsole.conf
23
23
fi
24
24
25
- KBDSUBDIRS=consolefonts, consoletrans, keymaps, unimaps
25
+ KBDSUBDIRS=( consolefonts consoletrans keymaps unimaps)
26
26
DEFAULT_FONT=" ${i18n_default_font:- eurlatgr} "
27
27
I18N_CONF=" /etc/locale.conf"
28
28
VCONFIG_CONF=" /etc/vconsole.conf"
@@ -110,7 +110,7 @@ install() {
110
110
111
111
if [[ ${kbddir} != " /usr/share" ]]; then
112
112
inst_dir /usr/share
113
- for _src in $( eval echo " { ${KBDSUBDIRS} } " ) ; do
113
+ for _src in " ${KBDSUBDIRS[@]} " ; do
114
114
[ ! -e " ${initdir} /usr/share/${_src} " ] && ln -s " ${kbddir} /${_src} " " ${initdir} /usr/share/${_src} "
115
115
done
116
116
fi
@@ -119,10 +119,9 @@ install() {
119
119
install_all_kbd () {
120
120
local rel f
121
121
122
- for __src in $( eval echo $dracutsysrootdir ${kbddir} /{${KBDSUBDIRS} }) ; do
123
- _src=${__src# $dracutsysrootdir }
124
- inst_dir " $_src "
125
- $DRACUT_CP -L -t " ${initdir} /${_src} " " $__src " /*
122
+ for _src in " ${KBDSUBDIRS[@]} " ; do
123
+ inst_dir " ${kbddir} /$_src "
124
+ $DRACUT_CP -L -t " ${initdir} /${kbddir} /$_src " " ${dracutsysrootdir}${kbddir} /$_src " /*
126
125
done
127
126
128
127
# remove unnecessary files
@@ -242,14 +241,13 @@ install() {
242
241
}
243
242
244
243
checks () {
245
- for kbddir in ${kbddir} /usr/lib/kbd /lib/kbd /usr/share /usr/share/kbd
246
- do
247
- [[ -d " $dracutsysrootdir ${kbddir} " ]] && \
248
- for dir in ${KBDSUBDIRS// ,/ }
249
- do
250
- [[ -d " $dracutsysrootdir ${kbddir} /${dir} " ]] && continue
251
- false
252
- done && break
244
+ for kbddir in ${kbddir} /usr/lib/kbd /lib/kbd /usr/share /usr/share/kbd; do
245
+ if [[ -d " $dracutsysrootdir ${kbddir} " ]]; then
246
+ for dir in " ${KBDSUBDIRS[@]} " ; do
247
+ [[ -d " $dracutsysrootdir ${kbddir} /${dir} " ]] && continue
248
+ false
249
+ done && break
250
+ fi
253
251
kbddir=' '
254
252
done
255
253
0 commit comments