From 40397e96a379d6b8f1ac5332a82bf89e739b2e5f Mon Sep 17 00:00:00 2001
From: bytedream <bytedream@protonmail.com>
Date: Mon, 7 Aug 2023 17:08:04 +0200
Subject: [PATCH] Fix arch release pipeline

---
 .github/scripts/PKGBUILD.binary | 10 ++++++----
 .github/scripts/PKGBUILD.source | 10 +++++-----
 .github/workflows/publish.yml   |  8 ++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/scripts/PKGBUILD.binary b/.github/scripts/PKGBUILD.binary
index c9cc76e..832f4d0 100644
--- a/.github/scripts/PKGBUILD.binary
+++ b/.github/scripts/PKGBUILD.binary
@@ -9,6 +9,8 @@ pkgver=$CI_PKG_VERSION
 pkgrel=1
 
 depends=('ffmpeg')
+provides=('crunchy-cli')
+conflicts=('crunchy-cli')
 source=(
   "crunchy-cli::https://github.com/crunchy-labs/crunchy-cli/releases/download/v${pkgver}/crunchy-cli-v${pkgver}-linux-x86_64"
   "manpages.zip::https://github.com/crunchy-labs/crunchy-cli/releases/download/v${pkgver}/crunchy-cli-v${pkgver}-manpages.zip"
@@ -32,8 +34,8 @@ package() {
 
   install -Dm755 crunchy-cli $pkgdir/usr/bin/crunchy-cli
   install -Dm644 manpages/* -t $pkgdir/usr/share/man/man1
-  install -Dm644 completions/crunchy-cli.bash $pkgdir/usr/share/bash-completions/completions/crunchy-cli
-  install -Dm644 completions/_crunchy-cli $pkgdir/usr/share/zsh/site-functions/_crunchy-cli
-  install -Dm644 completions/crunchy-cli.fish $pkgdir/usr/share/fish/vendor_completions.d/crunchy-cli.fish
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/crunchy-cli/LICENSE
+  install -Dm644 completions/crunchy-cli.bash -t $pkgdir/usr/share/bash-completions/completions/crunchy-cli
+  install -Dm644 completions/_crunchy-cli -t $pkgdir/usr/share/zsh/site-functions/_crunchy-cli
+  install -Dm644 completions/crunchy-cli.fish -t $pkgdir/usr/share/fish/vendor_completions.d/crunchy-cli.fish
+  install -Dm644 LICENSE -t $pkgdir/usr/share/licenses/crunchy-cli/LICENSE
 }
diff --git a/.github/scripts/PKGBUILD.source b/.github/scripts/PKGBUILD.source
index 737a699..beffe74 100644
--- a/.github/scripts/PKGBUILD.source
+++ b/.github/scripts/PKGBUILD.source
@@ -26,9 +26,9 @@ package() {
   cd "$srcdir/${pkgname}-$pkgver"
 
   install -Dm755 target/release/crunchy-cli $pkgdir/usr/bin/crunchy-cli
-  install -Dm644 target/release/manpages/* $pkgdir/usr/share/man/man1
-  install -Dm644 target/release/completions/crunchy-cli.bash $pkgdir/usr/share/bash-completions/completions/crunchy-cli
-  install -Dm644 target/release/completions/_crunchy-cli $pkgdir/usr/share/zsh/site-functions/_crunchy-cli
-  install -Dm644 target/release/completions/crunchy-cli.fish $pkgdir/usr/share/fish/vendor_completions.d/crunchy-cli.fish
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/crunchy-cli/LICENSE
+  install -Dm644 target/release/manpages/* -t $pkgdir/usr/share/man/man1
+  install -Dm644 target/release/completions/crunchy-cli.bash -t $pkgdir/usr/share/bash-completions/completions/crunchy-cli
+  install -Dm644 target/release/completions/_crunchy-cli -t $pkgdir/usr/share/zsh/site-functions/_crunchy-cli
+  install -Dm644 target/release/completions/crunchy-cli.fish -t $pkgdir/usr/share/fish/vendor_completions.d/crunchy-cli.fish
+  install -Dm644 LICENSE -t $pkgdir/usr/share/licenses/crunchy-cli/LICENSE
 }
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 37f4379..ddf4136 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -27,7 +27,7 @@ jobs:
         run: envsubst '$CI_PKG_VERSION,$CI_SHA_SUM' < .github/scripts/PKGBUILD.source > PKGBUILD
 
       - name: Publish crunchy-cli to AUR
-        uses: KSXGitHub/github-actions-deploy-aur@2.7.0
+        uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
         with:
           pkgname: crunchy-cli
           pkgbuild: ./PKGBUILD
@@ -39,7 +39,7 @@ jobs:
 
       - name: Generate crunchy-cli-bin sha sums
         run: |
-          curl -LO https://github.com/crunchy-labs/crunchy-cli/releases/download/${{ github.ref_name }}/crunchy-cli-${{ github.ref_name }}-x86_64-linux
+          curl -LO https://github.com/crunchy-labs/crunchy-cli/releases/download/${{ github.ref_name }}/crunchy-cli-${{ github.ref_name }}-linux-x86_64
           curl -LO https://github.com/crunchy-labs/crunchy-cli/releases/download/${{ github.ref_name }}/crunchy-cli-${{ github.ref_name }}-completions.zip
           curl -LO https://github.com/crunchy-labs/crunchy-cli/releases/download/${{ github.ref_name }}/crunchy-cli-${{ github.ref_name }}-manpages.zip
           curl -LO https://raw.githubusercontent.com/crunchy-labs/crunchy-cli/${{ github.ref_name }}/LICENSE
@@ -55,10 +55,10 @@ jobs:
           CI_MANPAGES_SHA_SUM: ${{ env.CRUNCHY_CLI_BIN_MANPAGES_SHA256 }}
           CI_COMPLETIONS_SHA_SUM: ${{ env.CRUNCHY_CLI_BIN_COMPLETIONS_SHA256 }}
           CI_LICENSE_SHA_SUM: ${{ env.CRUNCHY_CLI_BIN_LICENSE_SHA256 }}
-        run: envsubst '$CI_PKG_VERSION,$CI_SHA_SUM,$CI_COMPLETIONS_SHA_SUM,$CI_MANPAGES_SHA_SUM' < .github/scripts/PKGBUILD.binary > PKGBUILD
+        run: envsubst '$CI_PKG_VERSION,$CI_SHA_SUM,$CI_COMPLETIONS_SHA_SUM,$CI_MANPAGES_SHA_SUM,$CI_LICENSE_SHA_SUM' < .github/scripts/PKGBUILD.binary > PKGBUILD
 
       - name: Publish crunchy-cli-bin to AUR
-        uses: KSXGitHub/github-actions-deploy-aur@2.7.0
+        uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
         with:
           pkgname: crunchy-cli-bin
           pkgbuild: ./PKGBUILD