diff options
| author | Erich Eckner <git@eckner.net> | 2017-05-17 15:22:23 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2017-05-17 15:24:28 +0200 |
| commit | f7d19fbcaaca554d8d78a80f5e0a90196beb3dca (patch) | |
| tree | 5f3071d2c19919434f2040cda92f8c710f76f1d5 /bin/common-functions | |
| parent | f2d0036c2082921df579d791416035a7e72f1843 (diff) | |
| download | builder-f7d19fbcaaca554d8d78a80f5e0a90196beb3dca.tar.xz | |
bin/common-functions: tag PGBUILD modified even if only i486 was added
Diffstat (limited to 'bin/common-functions')
| -rwxr-xr-x | bin/common-functions | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/bin/common-functions b/bin/common-functions index c072612..d5a15f8 100755 --- a/bin/common-functions +++ b/bin/common-functions @@ -38,20 +38,21 @@ find_pkgbuild() { )" if [ -n "${PKGBUILD}" ]; then echo "${PKGBUILD}" - # add i486 to the arch list - sed '/^arch=[^#]*any/!s|^\(arch=(\)\([^#]*)\)\s*\(#.*\)\?$|\1i486 \2|' -i "${PKGBUILD}" - if [ -f "${repo_paths["archlinux32"]}/$2/$1/PKGBUILD" ] && \ - [ ! -f "${PKGBUILD}.changes-applied" ]; then - # If this package has modifications (or is new), apply them now: - # append PKGBUILD - cat "${repo_paths["archlinux32"]}/$2/$1/PKGBUILD" >> \ - "${PKGBUILD}" - # copy (and overwrite) other files - for file in "${repo_paths["archlinux32"]}/$2/$1/"*; do - if [ -f "${file}" ] && [ "${file##*/}" != "PKGBUILD" ]; then - cp "${file}" "${PKGBUILD%/*}/" - fi - done + if [ ! -f "${PKGBUILD}.changes-applied" ]; then + # add i486 to the arch list + sed '/^arch=[^#]*any/!s|^\(arch=(\)\([^#]*)\)\s*\(#.*\)\?$|\1i486 \2|' -i "${PKGBUILD}" + if [ -f "${repo_paths["archlinux32"]}/$2/$1/PKGBUILD" ]; then + # If this package has modifications (or is new), apply them now: + # append PKGBUILD + cat "${repo_paths["archlinux32"]}/$2/$1/PKGBUILD" >> \ + "${PKGBUILD}" + # copy (and overwrite) other files + for file in "${repo_paths["archlinux32"]}/$2/$1/"*; do + if [ -f "${file}" ] && [ "${file##*/}" != "PKGBUILD" ]; then + cp "${file}" "${PKGBUILD%/*}/" + fi + done + fi touch "${PKGBUILD}.changes-applied" fi break |