From e529483c28dd4f137596cde417cab0a48945efd4 Mon Sep 17 00:00:00 2001 From: javalsai Date: Mon, 21 Jul 2025 18:25:35 +0200 Subject: [PATCH] fix(pkg,aur): sources now are version unique --- assets/pkg/aur/lidm-bin/.SRCINFO | 8 ++++---- assets/pkg/aur/lidm-bin/PKGBUILD | 17 +++++++++-------- assets/pkg/aur/lidm-git/.SRCINFO | 2 +- assets/pkg/aur/lidm-git/PKGBUILD | 6 +++--- assets/pkg/aur/lidm/.SRCINFO | 2 +- assets/pkg/aur/lidm/PKGBUILD | 11 ++++++----- assets/pkg/aur/test-makepkg.sh | 9 --------- assets/pkg/aur/update-pkgs.sh | 6 ------ 8 files changed, 24 insertions(+), 37 deletions(-) diff --git a/assets/pkg/aur/lidm-bin/.SRCINFO b/assets/pkg/aur/lidm-bin/.SRCINFO index a3ec6b5..6bc1dc0 100644 --- a/assets/pkg/aur/lidm-bin/.SRCINFO +++ b/assets/pkg/aur/lidm-bin/.SRCINFO @@ -8,10 +8,10 @@ pkgbase = lidm-bin depends = pam provides = lidm conflicts = lidm - source = lidm::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-amd64 - source = default-theme.ini::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/themes/default.ini - source = lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/man/lidm.1 - source = lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/man/lidm-config.5 + source = lidm-1.2.3-1::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-amd64 + source = lidm-default-theme-1.2.3-1.ini::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/themes/default.ini + source = lidm-1.2.3-1.1::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/man/lidm.1 + source = lidm-config-1.2.3-1.5::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/man/lidm-config.5 sha256sums = a533b5aee3ffe04268f8d3ff8d7eb87f09d31fbe25e1b8b1ed29c42ef465bd4b sha256sums = ffaa5fe2cf5011bf53c90f81bfec8585158d35f72c0666db0bd4d3866ae041ca sha256sums = 7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8 diff --git a/assets/pkg/aur/lidm-bin/PKGBUILD b/assets/pkg/aur/lidm-bin/PKGBUILD index db7a59a..0e569a7 100644 --- a/assets/pkg/aur/lidm-bin/PKGBUILD +++ b/assets/pkg/aur/lidm-bin/PKGBUILD @@ -10,11 +10,12 @@ url="https://github.com/javalsai/lidm" license=('GPL') provides=('lidm') conflicts=('lidm') +_ver="${pkgver}-${pkgrel}" source=( - "lidm::$url/releases/download/v$pkgver/lidm-amd64" - "default-theme.ini::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/themes/default.ini" - "lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm.1" - "lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm-config.5" + "lidm-${_ver}::$url/releases/download/v$pkgver/lidm-amd64" + "lidm-default-theme-${_ver}.ini::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/themes/default.ini" + "lidm-${_ver}.1::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm.1" + "lidm-config-${_ver}.5::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm-config.5" ) sha256sums=('a533b5aee3ffe04268f8d3ff8d7eb87f09d31fbe25e1b8b1ed29c42ef465bd4b' 'ffaa5fe2cf5011bf53c90f81bfec8585158d35f72c0666db0bd4d3866ae041ca' @@ -22,8 +23,8 @@ sha256sums=('a533b5aee3ffe04268f8d3ff8d7eb87f09d31fbe25e1b8b1ed29c42ef465bd4b' '0aa5755bdcc60ea80cd9ee0f89233ffaf22c6cee9db9da277274a62c6ed477d9') package() { - install -Dm755 lidm "${pkgdir}/usr/bin/lidm" - install -Dm644 default-theme.ini "${pkgdir}/etc/lidm.ini" - install -Dm644 lidm.1 "${pkgdir}/usr/share/man/man1/lidm.1" - install -Dm644 lidm-config.5 "${pkgdir}/usr/share/man/man5/lidm-config.5" + install -Dm755 "lidm-${_ver}" "${pkgdir}/usr/bin/lidm" + install -Dm644 "lidm-default-theme-${_ver}.ini" "${pkgdir}/etc/lidm.ini" + install -Dm644 "lidm-${_ver}.1" "${pkgdir}/usr/share/man/man1/lidm.1" + install -Dm644 "lidm-config-${_ver}.5" "${pkgdir}/usr/share/man/man5/lidm-config.5" } diff --git a/assets/pkg/aur/lidm-git/.SRCINFO b/assets/pkg/aur/lidm-git/.SRCINFO index 06e908b..26835df 100644 --- a/assets/pkg/aur/lidm-git/.SRCINFO +++ b/assets/pkg/aur/lidm-git/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = lidm-git pkgdesc = A fully colorful customizable TUI display manager made in C. (last git commit) - pkgver = 0.1.0.r0.g8071694 + pkgver = 1.2.3.r3.g363deea pkgrel = 1 url = https://github.com/javalsai/lidm arch = any diff --git a/assets/pkg/aur/lidm-git/PKGBUILD b/assets/pkg/aur/lidm-git/PKGBUILD index afed1cb..0d34ff6 100644 --- a/assets/pkg/aur/lidm-git/PKGBUILD +++ b/assets/pkg/aur/lidm-git/PKGBUILD @@ -1,10 +1,10 @@ # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164 # Maintainer: javalsai pkgname=lidm-git -pkgver=1.2.3.r0.g7e1ec83 +pkgver=1.2.3.r3.g363deea pkgrel=1 depends=('pam') -makedepends=('git' 'make' 'gcc') +makedepends=('git') pkgdesc="A fully colorful customizable TUI display manager made in C. (last git commit)" arch=('any') url="https://github.com/javalsai/lidm" @@ -22,7 +22,7 @@ pkgver() { build() { cd "lidm" - make CFLAGS="-O3" + make } package() { diff --git a/assets/pkg/aur/lidm/.SRCINFO b/assets/pkg/aur/lidm/.SRCINFO index ab1023d..a85da19 100644 --- a/assets/pkg/aur/lidm/.SRCINFO +++ b/assets/pkg/aur/lidm/.SRCINFO @@ -8,7 +8,7 @@ pkgbase = lidm makedepends = git makedepends = gcc depends = pam - source = tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.2.3.tar.gz + source = lidm-1.2.3-1.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.2.3.tar.gz sha256sums = 1ce414b510c5bbc3e32ea882f915b4d3958cb82eb1fbb5cf33e62f69c844bf93 pkgname = lidm diff --git a/assets/pkg/aur/lidm/PKGBUILD b/assets/pkg/aur/lidm/PKGBUILD index 9a2bb14..0990f2c 100644 --- a/assets/pkg/aur/lidm/PKGBUILD +++ b/assets/pkg/aur/lidm/PKGBUILD @@ -2,21 +2,22 @@ # Maintainer: javalsai pkgname=lidm pkgver=1.2.3 -pkgrel=1 +pkgrel=2 depends=('pam') -makedepends=('git' 'gcc') +makedepends=('git') pkgdesc="A fully colorful customizable TUI display manager made in C. (build latest tag)" arch=('any') url="https://github.com/javalsai/lidm" license=('GPL') -source=("tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz") +_ver="${pkgver}-${pkgrel}" +source=("${pkgname}-${_ver}.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz") sha256sums=('1ce414b510c5bbc3e32ea882f915b4d3958cb82eb1fbb5cf33e62f69c844bf93') build() { - tar -xzf "tarball.tar.gz" + tar -xzf "${pkgname}-${_ver}.tar.gz" cd "lidm-$pkgver" - make CFLAGS="-O3" + make } package() { diff --git a/assets/pkg/aur/test-makepkg.sh b/assets/pkg/aur/test-makepkg.sh index 3f79352..e9a3e40 100755 --- a/assets/pkg/aur/test-makepkg.sh +++ b/assets/pkg/aur/test-makepkg.sh @@ -7,15 +7,6 @@ MYDIR=$(dirname "$MYSELF") for pkg in "$MYDIR"/*/; do printf "\x1b[1mEntering '%s'\x1b[0m\n" "$pkg" cd "$pkg" - - # shellcheck disable=SC1091 - source "PKGBUILD" - for source in "${source[@]}"; do - awk -F'::' '{print $1}' <<<"$source" | xargs rm -rf - done - - rm -rf ./*.{gz,zst} src pkg makepkg -f . - echo done diff --git a/assets/pkg/aur/update-pkgs.sh b/assets/pkg/aur/update-pkgs.sh index e725842..46e4866 100755 --- a/assets/pkg/aur/update-pkgs.sh +++ b/assets/pkg/aur/update-pkgs.sh @@ -17,12 +17,6 @@ for pkg in "$MYDIR"/lidm{,-bin}/; do sed -i "s/pkgver=.*/pkgver=$1/" PKGBUILD sed -i "s/pkgrel=.*/pkgrel=1/" PKGBUILD - grep 'source = ' <.SRCINFO | awk -F'= |::' '{print $2}' | \ - while read -r srcfile; do - printf "\x1b[31mDeleting '%s'\x1b[0m\n" "$srcfile" - rm -f "$srcfile" - done - updpkgsums makepkg --printsrcinfo | tee .SRCINFO echo