From 8608982b6ba861cf22643b7e2cf6857df96a74df Mon Sep 17 00:00:00 2001 From: SinTan1729 Date: Mon, 13 Mar 2023 11:58:40 -0500 Subject: [PATCH] Make sure srcnames are unique --- knock-bin/PKGBUILD | 6 +++--- topgrade-bin/PKGBUILD | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/knock-bin/PKGBUILD b/knock-bin/PKGBUILD index 8e055cb..77b01db 100644 --- a/knock-bin/PKGBUILD +++ b/knock-bin/PKGBUILD @@ -2,13 +2,13 @@ pkgname="knock-bin" _pkgname="knock" pkgver=1.3.1 -pkgrel=5 +pkgrel=6 pkgdesc="Convert ACSM files to PDF/EPUBs with one command on Linux" arch=('x86_64' 'aarch64') url="https://web.archive.org/web/20221020182238mp_/https://github.com/BentonEdmondson/knock" license=('GPL3') -source_x86_64=("knock::$url/releases/download/$pkgver/$_pkgname-$pkgver-x86_64-linux") -source_aarch64=("knock::$url/releases/download/$pkgver/$_pkgname-$pkgver-aarch64-linux") +source_x86_64=("knock_x86_64-$pkgver::$url/releases/download/$pkgver/$_pkgname-$pkgver-x86_64-linux") +source_aarch64=("knock_aarch64-$pkgver::$url/releases/download/$pkgver/$_pkgname-$pkgver-aarch64-linux") b2sums_x86_64=('ec0e7c0041cdec2a6bc7bdb3fec54eaaa55ed36212480494969b64b26570bf12a446d7949f9015d47d34cb01a59ede52030ea095bfd33d80668466eae8688885') b2sums_aarch64=('5651be570955f2803e5badaca65c440e1d037e01b4e3dd9a69619126e4adaddda3921a09091b888006c45a7125b749b32895f0a8d7bf51c8af1d9fa3e7c9f18a') package() { diff --git a/topgrade-bin/PKGBUILD b/topgrade-bin/PKGBUILD index 0bb31d7..5f5a0a6 100644 --- a/topgrade-bin/PKGBUILD +++ b/topgrade-bin/PKGBUILD @@ -2,39 +2,39 @@ pkgname="topgrade-bin" _pkgname="topgrade" pkgver=10.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="Invoke the upgrade procedure of multiple package managers" arch=('x86_64' 'aarch64' 'armv7h') url='https://github.com/topgrade-rs/topgrade' license=('GPL3') provides=('topgrade') conflicts=('topgrade') -source_x86_64=("topgrade_x86_64.tar.gz::$url/releases/download/v$pkgver/$_pkgname-v$pkgver-x86_64-unknown-linux-musl.tar.gz") -source_aarch64=("topgrade_aarch64.tar.gz::$url/releases/download/v$pkgver/$_pkgname-v$pkgver-aarch64-unknown-linux-musl.tar.gz") -source_armv7h=("topgrade_armv7h.tar.gz::$url/releases/download/v$pkgver/$_pkgname-v$pkgver-armv7-unknown-linux-gnueabihf.tar.gz") +source_x86_64=("topgrade_x86_64-$pkgver.tar.gz::$url/releases/download/v$pkgver/$_pkgname-v$pkgver-x86_64-unknown-linux-musl.tar.gz") +source_aarch64=("topgrade_aarch64-$pkgver.tar.gz::$url/releases/download/v$pkgver/$_pkgname-v$pkgver-aarch64-unknown-linux-musl.tar.gz") +source_armv7h=("topgrade_armv7h-$pkgver.tar.gz::$url/releases/download/v$pkgver/$_pkgname-v$pkgver-armv7-unknown-linux-gnueabihf.tar.gz") b2sums_x86_64=('d852a826477489be8da9010f2519ca74d2f906fe2b4bf532e5722775fe3b6bc6d41e28068ac3b105ff307068b50df40327fec99ec2747ef9625b18be3a5aaf60') b2sums_aarch64=('20976e837888d628e1fd6c0e229514b25882622344966aab6e8c7a5ce92215f9e4636d282d3df99eb904919dea267ab8b1aea5b063afdca97b3e0dce749fdbb8') b2sums_armv7h=('fc9652c83bcd9ca2cacfcccb5b0525746b494ebb93bef1f4ada4d4b33737ee41be2fbc09058b30e8bf24490fbdfdb69ca3fdbe26a5d68850fc00508da4b08f84') package() { # disable self-update as it won't work - echo '#!/bin/sh'$'\n\n''TOPGRADE_NO_SELF_UPGRADE=true /opt/topgrade/topgrade "$@"' > topgrade-sh + echo '#!/bin/sh'$'\n\n''TOPGRADE_NO_SELF_UPGRADE=true /opt/topgrade/topgrade "$@"' >topgrade-sh # install binary install -Dm755 ./topgrade "$pkgdir/opt/topgrade/topgrade" install -Dm755 ./topgrade-sh "$pkgdir/usr/local/bin/topgrade" # manpage - ./topgrade --gen-manpage | sed 's/.TH Topgrade 1/.TH Topgrade 8/' > topgrade.8 + ./topgrade --gen-manpage | sed 's/.TH Topgrade 1/.TH Topgrade 8/' >topgrade.8 install -Dm644 ./topgrade.8 "$pkgdir/usr/local/man/man8/topgrade.8" # completions - if $(command -v fish &> /dev/null); then - ./topgrade --gen-completion fish > topgrade.fish + if $(command -v fish &>/dev/null); then + ./topgrade --gen-completion fish >topgrade.fish install -Dm644 ./topgrade.fish "${pkgdir}/usr/share/fish/completions/topgrade.fish" fi - if $(command -v bash &> /dev/null); then - ./topgrade --gen-completion bash > topgrade.bash - install -Dm644 ./topgrade.bash "${pkgdir}/usr/share/bash-completion/completions/topgrade" + if $(command -v bash &>/dev/null); then + ./topgrade --gen-completion bash >topgrade.bash + install -Dm644 ./topgrade.bash "${pkgdir}/usr/share/bash-completion/completions/topgrade" fi - if $(command -v zsh &> /dev/null); then - ./topgrade --gen-completion zsh > topgrade.zsh + if $(command -v zsh &>/dev/null); then + ./topgrade --gen-completion zsh >topgrade.zsh install -Dm644 ./topgrade.zsh "${pkgdir}/usr/share/zsh/site-functions/_topgrade" fi }