From 6df7856873f0030101828069c9fde1ab7d8850e8 Mon Sep 17 00:00:00 2001 From: Dominic Date: Mon, 9 Dec 2024 00:41:40 +0100 Subject: [PATCH] fix pkgver/pkgrel variables --- action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index 41cb649..ab05405 100644 --- a/action.yml +++ b/action.yml @@ -50,8 +50,8 @@ runs: pkgbase='${{inputs.pkgbase}}' [ -n "$pkgbase" ] || pkgbase="$( (. PKGBUILD && printf '%s' "$pkgbase") )" [ -n "$pkgbase" ] || pkgbase="$( (. PKGBUILD && printf '%s' "$pkgname") )" - [ -n "$pkgver" ] || pkgver="$( (. PKGBUILD && printf '%s' "$pkgver") )" - [ -n "$pkgrel" ] || pkgver="$( (. PKGBUILD && printf '%s' "$pkgrel") )" + pkgver="$( (. PKGBUILD && printf '%s' "$pkgver") )" + pkgrel="$( (. PKGBUILD && printf '%s' "$pkgrel") )" [ -n "$pkgbase" ] || \ ( echo "Failed to determine pkgbase"; exit 1 ) @@ -66,7 +66,7 @@ runs: git add . git config user.name "${{github.event.head_commit.committer.name}}" git config user.email "${{github.event.head_commit.committer.email}}" - git commit -m "$pkgbase $pkgver-$pkgrel (${{github.event.head_commit.url}})" \ + git commit -m "$(echo -e "$pkgbase $pkgver-$pkgrel\n${{github.event.head_commit.url}}")" \ --author "${{github.event.head_commit.author.name}} <${{github.event.head_commit.author.email}}>" git show HEAD echo git push aur "${{github.ref_name}}:master"