From 277e57c21b773428b5e01682448068787192632a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 29 Dec 2018 21:15:01 +0100 Subject: [PATCH] Allow to run release scripts on top-level dir --- devel/apply-versions.sh | 6 +++--- devel/own-projects/apply-versions-spec.sh | 2 +- devel/own-projects/release-on-github.sh | 2 +- devel/own-projects/upload-mingw-w64-to-github.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/apply-versions.sh b/devel/apply-versions.sh index 837aa5bc..bf793be4 100755 --- a/devel/apply-versions.sh +++ b/devel/apply-versions.sh @@ -1,10 +1,10 @@ #!/bin/bash set -e # abort on first error shopt -s nullglob -source versions.sh +source "$(dirname $0)/versions.sh" -for pkgbuild_file in "${PKGBUILD_DIR:-..}"/*/*/PKGBUILD; do - trimmed_path=${pkgbuild_file#${PKGBUILD_DIR:-..}/} +for pkgbuild_file in "${PKGBUILD_DIR:-.}"/*/*/PKGBUILD; do + trimmed_path=${pkgbuild_file#${PKGBUILD_DIR:-.}/} project_name=${trimmed_path%%/*} variant=${trimmed_path%/PKGBUILD} variant=${variant#$project_name/} diff --git a/devel/own-projects/apply-versions-spec.sh b/devel/own-projects/apply-versions-spec.sh index b0e788a7..33606803 100755 --- a/devel/own-projects/apply-versions-spec.sh +++ b/devel/own-projects/apply-versions-spec.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e # abort on first error shopt -s nullglob -source ../versions.sh +source "$(dirname $0)/../versions.sh" for spec_file in "$OSC_DIR"/*/*/*.spec; do trimmed_path=${spec_file#$OSC_DIR/*/*/} diff --git a/devel/own-projects/release-on-github.sh b/devel/own-projects/release-on-github.sh index 4a934499..f5a83175 100755 --- a/devel/own-projects/release-on-github.sh +++ b/devel/own-projects/release-on-github.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e # abort on first error shopt -s nullglob -source ../versions.sh +source "$(dirname $0)/../versions.sh" if ! [[ $GITHUB_TOKEN ]]; then echo "Don't forget to set \$GITHUB_TOKEN." diff --git a/devel/own-projects/upload-mingw-w64-to-github.sh b/devel/own-projects/upload-mingw-w64-to-github.sh index fe42e356..92f98ba4 100755 --- a/devel/own-projects/upload-mingw-w64-to-github.sh +++ b/devel/own-projects/upload-mingw-w64-to-github.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e # abort on first error shopt -s nullglob -source ../versions.sh +source "$(dirname $0)/../versions.sh" repo_dir=${PATH_REPO_OWNSTUFF} if ! [[ $repo_dir ]]; then