From dcec3671d8becfa88b6a47bf03ecfd348a81381b Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 30 Jun 2022 10:38:35 +0200 Subject: [PATCH] modbuild: argument parsing fixed --- Pmodules/modbuild.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in index d82c41a..ace74f8 100755 --- a/Pmodules/modbuild.in +++ b/Pmodules/modbuild.in @@ -305,10 +305,13 @@ parse_args() { done if [[ -z ${BUILD_SCRIPT} ]]; then if [[ -r "${PWD}/build" ]]; then - BUILD_SCRIPT="${PWD}/build" - BUILDBLOCK_DIR=$(dirname "${BUILD_SCRIPT}") - else - std::die 1 "No build-block specified!" + if grep -q '#!.* modbuild' "${PWD}/build"; then + BUILD_SCRIPT="${PWD}/build" + BUILDBLOCK_DIR=$(dirname "${BUILD_SCRIPT}") + fi + fi + if [[ -z ${BUILD_SCRIPT} ]]; then + std::die 1 "Don't know what to build!" fi fi (( ${#versions[@]} > 0)) || versions+=( '.*' )