From c2b35f231dcc2fe0e877de0791ff82180caec422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Thu, 16 Feb 2017 10:46:24 +0000 Subject: subr/pkg_patch.subr: fix heuristic. --- subr/pkg_patch.subr | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'subr') 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 -- cgit v1.2.3