Skip to content

Commit ae1d905

Browse files
committed
[update] : Use common function
1 parent 67a2a84 commit ae1d905

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

tools/pkglist.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,16 @@ fi
160160

161161
set +e
162162

163+
get_filelist(){
164+
if [[ -d "${1}" ]]; then
165+
find "${1}" -mindepth 1 -name "*.${arch}" -typr f -or -type l 2> /dev/null
166+
fi
167+
}
168+
163169
#-- Detect package list to load --#
164170
# Add the files for each channel to the list of files to read.
165-
readarray -t _loadfilelist < <(ls ${channel_dir}/${pkgdir_name}.${arch}/*.${arch} 2> /dev/null)
171+
#readarray -t _loadfilelist < <(ls ${channel_dir}/${pkgdir_name}.${arch}/*.${arch} 2> /dev/null)
172+
readarray -t _loadfilelist < <(get_filelist "${channel_dir}/${pkgdir_name}.${arch}")
166173

167174
_loadfilelist+=(
168175
"${channel_dir}/${pkgdir_name}.${arch}/lang/${locale_name}.${arch}"
@@ -176,13 +183,15 @@ for_module '_loadfilelist+=(${module_dir}/{}/${pkgdir_name}.${arch}/kernel/${ker
176183

177184
# Plymouth package list
178185
if [[ "${boot_splash}" = true ]]; then
179-
readarray -t -O "${#_loadfilelist[@]}" _loadfilelist < <(ls ${channel_dir}/${pkgdir_name}.${arch}/plymouth/*.${arch} 2> /dev/null)
186+
#readarray -t -O "${#_loadfilelist[@]}" _loadfilelist < <(ls ${channel_dir}/${pkgdir_name}.${arch}/plymouth/*.${arch} 2> /dev/null)
187+
readarray -t -O "${#_loadfilelist[@]}" _loadfilelist < <(get_filelist "${channel_dir}/${pkgdir_name}.${arch}/plymouth")
180188
for_module '_loadfilelist+=($(ls ${module_dir}/{}/${pkgdir_name}.${arch}/plymouth/*.${arch} 2> /dev/null))'
181189
fi
182190

183191
# memtest86 package list
184192
if [[ "${memtest86}" = true ]]; then
185-
readarray -t -O "${#_loadfilelist[@]}" _loadfilelist <(ls ${channel_dir}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null)
193+
#readarray -t -O "${#_loadfilelist[@]}" _loadfilelist <(ls ${channel_dir}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null)
194+
readarray -t -O "${#_loadfilelist[@]}" _loadfilelist <(get_filelist "${channel_dir}/${pkgdir_name}.${arch}/memtest86")
186195

187196
for_module '_loadfilelist+=($(ls ${module_dir}/{}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null))'
188197
fi

0 commit comments

Comments
 (0)