diff options
| author | Mark Ferrell <major@homeonderanged.org> | 2014-04-15 11:51:25 -0700 |
|---|---|---|
| committer | Mark Ferrell <major@homeonderanged.org> | 2014-04-15 11:53:02 -0700 |
| commit | f46c55ef4a83a4566a4bdd112166b3c9a61f16cd (patch) | |
| tree | 97df95fc17aaea09a8b918837887cffb9f872225 | |
| parent | c6672da7bb06ecd6541b50353855ad658136428f (diff) | |
Look for the builder script index in multiple locations
| -rwxr-xr-x | libexec/build-makedeps | 9 |
1 files changed, 8 insertions, 1 deletions
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}'" |