makepkg: quote arrays in order to preserve spaces in array items
Fixes FS#16871 and makes the pkgdesc workaround obsolete. Signed-off-by: Cedric Staniewski <cedric@gmx.ca> Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
133a39e2bb
commit
db756ed931
1 changed files with 2 additions and 7 deletions
|
@ -1298,7 +1298,7 @@ devel_update() {
|
|||
backup_package_variables() {
|
||||
for var in ${splitpkg_overrides[@]}; do
|
||||
indirect="${var}_backup"
|
||||
eval "${indirect}=(\${$var[@]})"
|
||||
eval "${indirect}=(\"\${$var[@]}\")"
|
||||
done
|
||||
}
|
||||
|
||||
|
@ -1306,16 +1306,11 @@ restore_package_variables() {
|
|||
for var in ${splitpkg_overrides[@]}; do
|
||||
indirect="${var}_backup"
|
||||
if [ -n "${!indirect}" ]; then
|
||||
eval "${var}=(\${$indirect[@]})"
|
||||
eval "${var}=(\"\${$indirect[@]}\")"
|
||||
else
|
||||
unset ${var}
|
||||
fi
|
||||
done
|
||||
|
||||
# pkgdesc gets restored as an array - convert back to a string
|
||||
local pkgdesc_backup="${pkgdesc[@]}"
|
||||
unset pkgdesc
|
||||
pkgdesc=${pkgdesc_backup}
|
||||
}
|
||||
|
||||
# getopt like parser
|
||||
|
|
Loading…
Add table
Reference in a new issue