X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/905283aa36b36d51c2c4376489cd97b34b488104..a084df558c2bb054140a2bea08c973fa76209b97:/build/run-build-packages-one-target.sh diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh index f2e514736b..ef7862c8d6 100755 --- a/build/run-build-packages-one-target.sh +++ b/build/run-build-packages-one-target.sh @@ -86,12 +86,15 @@ while [ $# -gt 0 ]; do test_packages=1 ;; --build-version) - if ! [[ "$2" =~ (.*)-(.*) ]]; then + if [[ -z "$2" ]]; then + : + elif ! [[ "$2" =~ (.*)-(.*) ]]; then echo >&2 "FATAL: --build-version '$2' does not include an iteration. Try '${2}-1'?" exit 1 + else + ARVADOS_BUILDING_VERSION="${BASH_REMATCH[1]}" + ARVADOS_BUILDING_ITERATION="${BASH_REMATCH[2]}" fi - ARVADOS_BUILDING_VERSION="${BASH_REMATCH[1]}" - ARVADOS_BUILDING_ITERATION="${BASH_REMATCH[2]}" shift ;; --) @@ -106,10 +109,21 @@ done set -e -echo "build version='$ARVADOS_BUILDING_VERSION', package iteration='$ARVADOS_BUILDING_ITERATION'" +if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then + echo "build version='$ARVADOS_BUILDING_VERSION', package iteration='$ARVADOS_BUILDING_ITERATION'" +fi if [[ -n "$test_packages" ]]; then if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.rpm')" ]] ; then + set +e + /usr/bin/which createrepo >/dev/null + if [[ "$?" != "0" ]]; then + echo >&2 + echo >&2 "Error: please install createrepo. E.g. sudo apt-get install createrepo" + echo >&2 + exit 1 + fi + set -e createrepo $WORKSPACE/packages/$TARGET fi