From 7a9f808a0fd80c14b32223fa73d5368294994e49 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Sat, 17 Sep 2011 15:50:30 +0200 Subject: makechrootpkg: Source PKGBUILD only once Signed-off-by: Lukas Fleischer --- makechrootpkg.in | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 11fa401..04893b8 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -219,20 +219,20 @@ eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf") export CARCH # Copy PKGBUILD and sources -source=( $(source PKGBUILD; echo ${source[@]}) ) cp PKGBUILD "$copydir/build/" -for file in "${source[@]}"; do - file="${file%%::*}" - file="${file##*://*/}" - if [[ -f $file ]]; then - cp "$file" "$copydir/srcdest/" - elif [[ -f $SRCDEST/$file ]]; then - cp "$SRCDEST/$file" "$copydir/srcdest/" - fi -done - ( source PKGBUILD + for file in "${source[@]}"; do + file="${file%%::*}" + file="${file##*://*/}" + if [[ -f $file ]]; then + cp "$file" "$copydir/srcdest/" + elif [[ -f $SRCDEST/$file ]]; then + cp "$SRCDEST/$file" "$copydir/srcdest/" + fi + done + + # Find all changelog and install files, even inside functions for i in changelog install; do sed -n "s/^[[:space:]]*$i=//p" PKGBUILD | while IFS= read -r file; do # evaluate any bash variables used -- cgit v1.2.3-70-g09d2