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>

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