From e06261471cf6765693faf424ddbb8e70dd29c1f3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 30 Jun 2021 16:27:01 +0200 Subject: [PATCH] release: fix release script for relative paths --- contrib/fedora/rpm/release.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/release.sh b/contrib/fedora/rpm/release.sh index 9aa30dde33..9aa98ddaaf 100755 --- a/contrib/fedora/rpm/release.sh +++ b/contrib/fedora/rpm/release.sh @@ -192,6 +192,8 @@ DIR="$(git rev-parse --show-toplevel)" ORIGIN=origin +BASH_SOURCE_ABSOLUTE="$(readlink -f "$BASH_SOURCE")" + test -d "$DIR" && cd "$DIR" && test -f ./contrib/fedora/rpm/build_clean.sh || die "cannot find NetworkManager base directory" @@ -354,7 +356,7 @@ if [ -n "$RELEASE_BRANCH" ]; then fi if [ "$ALLOW_LOCAL_BRANCHES" != 1 ]; then - cmp <(git show origin/main:contrib/fedora/rpm/release.sh) "$BASH_SOURCE" || die "$BASH_SOURCE is not identical to \`git show origin/main:contrib/fedora/rpm/release.sh\`" + cmp <(git show origin/main:contrib/fedora/rpm/release.sh) "$BASH_SOURCE_ABSOLUTE" || die "$BASH_SOURCE is not identical to \`git show origin/main:contrib/fedora/rpm/release.sh\`" fi if ! check_news "$RELEASE_MODE" "@{VERSION_ARR[@]}" ; then