diff options
| author | Erich Eckner <git@eckner.net> | 2017-07-28 11:05:00 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2017-07-28 11:05:00 +0200 |
| commit | f543bdbc3ef36d0844adc5a75449cb8f22099a1e (patch) | |
| tree | 4596e885253a52d197655c43ce4f4059316972e9 /bin/build-packages | |
| parent | 8e6b99b7ee6bd8589c4f005315e4657c95f182b5 (diff) | |
| download | builder-f543bdbc3ef36d0844adc5a75449cb8f22099a1e.tar.xz | |
bin/common-functions: extract_source_directory new, extract full source dir before running "makepkg --printsrcinfo"
Diffstat (limited to 'bin/build-packages')
| -rwxr-xr-x | bin/build-packages | 13 |
1 files changed, 1 insertions, 12 deletions
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 |