From f46c55ef4a83a4566a4bdd112166b3c9a61f16cd Mon Sep 17 00:00:00 2001 From: Mark Ferrell Date: Tue, 15 Apr 2014 11:51:25 -0700 Subject: Look for the builder script index in multiple locations --- libexec/build-makedeps | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libexec/build-makedeps b/libexec/build-makedeps index 48e889e..8784afb 100755 --- a/libexec/build-makedeps +++ b/libexec/build-makedeps @@ -57,7 +57,14 @@ for package in $(echo "${BUILDER_PKGDIR}"/*/*); do package_export="${BUILDER_TOPDIR}/exports/${CATEGORY}/${NAME}-${VERSION}-${RELEASE}.${CHOST%%-*}.rpm" package_logdir="${L}" - package_sources="${BUILDER_TOPDIR}/.git/modules/scripts/index" + package_sources= + for index in ".git/modules/scripts" "scripts/.git"; do + if test -f "${BUILDER_TOPDIR}/${index}/index"; then + package_sources="${BUILDER_TOPDIR}/${index}/index" + break + fi + done + for config in ${BUILDER_INCLUDED}; do if test -f "${BUILDER_CFGDIR}/${config}"; then die "include does not exist '${file}'" -- cgit v1.2.3-18-g5258