diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-16 10:46:24 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-16 10:46:24 +0000 |
| commit | c2b35f231dcc2fe0e877de0791ff82180caec422 (patch) | |
| tree | c89a92d7f2d7cce4040e50000c4e184ccefa1276 | |
| parent | cc101dbb2300868dd4c50561f41d55df71bca0fa (diff) | |
| download | midipix_build-c2b35f231dcc2fe0e877de0791ff82180caec422.tar.bz2 midipix_build-c2b35f231dcc2fe0e877de0791ff82180caec422.tar.xz | |
subr/pkg_patch.subr: fix heuristic.
| -rw-r--r-- | subr/pkg_patch.subr | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/subr/pkg_patch.subr b/subr/pkg_patch.subr index de32fe30..94fe780b 100644 --- a/subr/pkg_patch.subr +++ b/subr/pkg_patch.subr @@ -4,25 +4,25 @@ pkg_patch() { local _patch_fname; - set +o noglob; + set -o noglob; for _patch_fname in \ - ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR%-*}.local.patch \ - ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_NAME}.local.patch \ - ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch \ - ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_NAME}.local@${BUILD_HNAME}.patch \ - ${WORKDIR}/chainport/${PKG_SUBDIR%-*}.midipix.patch \ ${WORKDIR}/chainport/${PKG_NAME}.midipix.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}/*.patch \ + ${WORKDIR}/chainport/${PKG_SUBDIR}.midipix.patch \ + ${WORKDIR}/chainport/${PKG_SUBDIR%-*}.midipix.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}/*.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}/*.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local@${BUILD_HNAME}.patch; do + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local@${BUILD_HNAME}.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch; do if [ -r "${_patch_fname}" ]; then patch -b -d "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; fi; done; - set -o noglob; + set +o noglob; }; # vim:filetype=sh |