common: expand_destdir rewrite

This commit is contained in:
Enno Boland 2015-11-18 11:19:09 +01:00
parent 18e288fd2c
commit 82b736b616
3 changed files with 15 additions and 12 deletions

View file

@ -1,15 +1,18 @@
# This provides the extglob function to expand wildcards in the destdir
expand_destdir() {
local glob_list= result= glob= file=
local result= glob= file=
for glob; do
glob_list+=" $DESTDIR/$glob"
done
shopt -s extglob
for file in $glob_list; do
result+=" ${file#$DESTDIR/}"
done
shopt -u extglob
echo $result
(
set -f
for glob in $@; do
files=$(echo "${PKGDESTDIR}/${glob}")
set +f
for file in $files; do
result+="${blank}${file#$PKGDESTDIR/}"
blank=" "
done
done
echo "$result"
)
}

View file

@ -50,7 +50,7 @@ genpkg() {
local _replaces="$(echo $replaces)"
local _reverts="$(echo $reverts)"
local _mutable_files="$(echo $mutable_files)"
local _conf_files="$(expand_destdir $conf_files)"
local _conf_files="$(expand_destdir "$conf_files")"
local _alternatives="$(echo $alternatives)"
local _tags="$(echo $tags)"

View file

@ -25,7 +25,7 @@ hook() {
done
# Check that configuration files really exist.
for f in $(expand_destdir ${conf_files}); do
for f in $(expand_destdir "${conf_files}"); do
if [ ! -f "${PKGDESTDIR}/${f}" ]; then
msg_red "${pkgver}: '$f' configuration file not in PKGDESTDIR!\n"
error=1