From db756ed9316648c8ba6a82a0f0818515421f8a94 Mon Sep 17 00:00:00 2001 From: Cedric Staniewski Date: Thu, 5 Nov 2009 23:14:09 +0000 Subject: 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 Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.3-70-g09d2