summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Staniewski <cedric@gmx.ca>2009-11-05 23:14:09 +0000
committerDan McGee <dan@archlinux.org>2009-11-10 11:24:20 -0600
commitdb756ed9316648c8ba6a82a0f0818515421f8a94 (patch)
treeba748c2a59bf6d9c86f2886b839f062276fc6c83
parent133a39e2bb78f2be1a60094a5a398f04315df64a (diff)
downloadpacman-db756ed9316648c8ba6a82a0f0818515421f8a94.tar.xz
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>
-rw-r--r--scripts/makepkg.sh.in9
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index ba0d3d91..13e4ed5e 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -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