summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2010-06-09 15:31:30 +1000
committerAllan McRae <allan@archlinux.org>2010-06-09 15:58:05 +1000
commitb8863622828287fc0ba204ce7270176753df6bd2 (patch)
tree49de03aa8af93b55a379b10193928234520b3ff6 /scripts
parentac5c2fd09b6b612fe956ac40f8f90a0cd26881a9 (diff)
downloadpacman-b8863622828287fc0ba204ce7270176753df6bd2.tar.xz
makepkg: fix errors with multiple install or changelog files
Another issue caused by fe1e3471. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 86984db2..7785ff19 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