makepkg: fix errors with multiple install or changelog files
Another issue caused by fe1e3471
.
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
ac5c2fd09b
commit
b886362282
1 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue