bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: quote arrays in order to preserve spaces in array items

Browse source 
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:
Cedric Staniewski 2009-11-05 23:14:09 +00:00 • committed by Dan McGee
parent 133a39e2bb
commit db756ed931
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/makepkg.sh.in
View file

@ -1298,7 +1298,7 @@ devel_update() {
backup_package_variables() { backup_package_variables() {
for var in ${splitpkg_overrides[@]}; do for var in ${splitpkg_overrides[@]}; do
indirect="${var}_backup" indirect="${var}_backup"
eval "${indirect}=(\${$var[@]})" eval "${indirect}=(\"\${$var[@]}\")"
done done
} }
@ -1306,16 +1306,11 @@ restore_package_variables() {
for var in ${splitpkg_overrides[@]}; do for var in ${splitpkg_overrides[@]}; do
indirect="${var}_backup" indirect="${var}_backup"
if [ -n "${!indirect}" ]; then if [ -n "${!indirect}" ]; then
eval "${var}=(\${$indirect[@]})" eval "${var}=(\"\${$indirect[@]}\")"
else else
unset ${var} unset ${var}
fi fi
done done
# pkgdesc gets restored as an array - convert back to a string
local pkgdesc_backup="${pkgdesc[@]}"
unset pkgdesc
pkgdesc=${pkgdesc_backup}
} }
# getopt like parser # getopt like parser