From f543bdbc3ef36d0844adc5a75449cb8f22099a1e Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 28 Jul 2017 11:05:00 +0200
Subject: bin/common-functions: extract_source_directory new, extract full
 source dir before running "makepkg --printsrcinfo"

---
 bin/build-packages | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'bin/build-packages')

diff --git a/bin/build-packages b/bin/build-packages
index 2fc602b..c54f34e 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -149,18 +149,7 @@ while [ ${count} -ne 0 ]; do
       tmp_dir="$(mktemp -d "${work_dir}/tmp.XXXXXX")"
       trap bail_out EXIT
 
-      if [ -n "${PKGBUILD}" ]; then
-        eval 'git -C "'"$(printf '${repo_paths__%s}' "${git_repo}")"'"'" archive '${git_revision}' -- '${PKGBUILD%/*}'" | \
-          tar -x --strip-components=3 -C "${tmp_dir}"
-      fi
-      if [ -n "${PKGBUILD_mod}" ]; then
-        git -C "${repo_paths__archlinux32}" archive "${mod_git_revision}" -- "${PKGBUILD_mod%/*}" | \
-          tar -x --overwrite --exclude 'PKGBUILD' --strip-components=2 -C "${tmp_dir}"
-        git -C "${repo_paths__archlinux32}" archive "${mod_git_revision}" -- "${PKGBUILD_mod}" | \
-          tar -Ox "${PKGBUILD_mod}" >> \
-          "${tmp_dir}/PKGBUILD"
-        append_architectures "${tmp_dir}/PKGBUILD"
-      fi
+      extract_source_directory "${git_repo}" "${git_revision}" "${mod_git_revision}" "${tmp_dir}"
 
       cd "${tmp_dir}"
       success=false
-- 
cgit v1.2.3-54-g00ecf