[pacman-dev] [PATCH] makepkg: fix errors with multiple install or changelog files

Allan McRae allan at archlinux.org
Wed Jun 9 01:36:22 EDT 2010


Another issue caused by fe1e3471.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 scripts/makepkg.sh.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 86984db..7785ff1 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1106,9 +1106,9 @@ create_srcpackage() {
 
 	local i
 	for i in 'changelog' 'install'; do
-		local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT")
+		local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT")
 		local file
-		for file in ${!i}; do
+		for file in $filelist; do
 			# evaluate any bash variables used
 			eval file=${file}
 			if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then
@@ -1237,9 +1237,9 @@ check_sanity() {
 
 	local i
 	for i in 'changelog' 'install'; do
-		local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT")
+		local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") 
 		local file
-		for file in ${!i}; do
+		for file in $filelist; do
 			# evaluate any bash variables used
 			eval file=${file}
 			if [[ ! -f $file ]]; then
-- 
1.7.1




More information about the pacman-dev mailing list