From 4429b3897c016a71e8be4e40e68d4d12b377b72a Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 29 Mar 2023 15:30:11 +0200 Subject: Updated PKGBUILD with a pkgver, depends and hashsums (#1696) * Fixing some values that trigger issues in PKGBUILD * license dynamic * Updated PKGBUILD to contain a pkgver() as well as update hashsums and added systemd as depends --- PKGBUILD | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 70b18d00..108fa56e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,14 +4,13 @@ # Contributor: demostanis worlds pkgname=archinstall -pkgver=2.5.0 -#pkgver=$(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g') +#pkgver=2.5.4 pkgrel=1 pkgdesc="Just another guided/automated Arch Linux installer with a twist" arch=(any) url="https://github.com/archlinux/archinstall" license=(GPL3) -depends=(python) +depends=(python systemd) makedepends=(python-build python-installer python-setuptools python-sphinx python-wheel) provides=(python-archinstall) conflicts=(python-archinstall) @@ -20,12 +19,17 @@ source=( $pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz $pkgname-$pkgver.tar.gz.sig::$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz.sig ) -sha512sums=('9516719c4e4fe0423224a35b4846cf5c8daeb931cff6fed588957840edc5774e9c6fe18619d2356a6d76681ae3216ba19f5d0f0bd89c6301b4ff9b128d037d13' +sha512sums=('3bfdd2b33ef3a784bd6c847afce75b0d5c1997f8374db5f75adc6fe9e35ab135e7cdb2fdcef01999fcb6c03ed80159f02d3da560d28e8da8fe17043f4cdac108' 'SKIP') -b2sums=('a29ae767756f74ce296d53e31bb8376cfa7db19a53b8c3997b2d8747a60842ba88e8b18c505bc56a36d685f73f7a6d9e53adff17953c8a4ebaabc67c6db8e583' +b2sums=('87c3ad807e87d834d59210cb28d14c93acabe8996bcc7407866307f9cdddf4e233a35c96e99e02aebbbb95548bdfa125772fb4703bf0152227e4163cd621860a' 'SKIP') validpgpkeys=('256F73CEEFC6705C6BBAB20E5FBBB32941E3740A') # Anton Hvornum (Torxed) +pkgver() { + cd $pkgname-$pkgver + git describe --long --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' | grep -o -E '[0-9.]{5}' +} + prepare() { cd $pkgname-$pkgver # use real directories for examples and profiles, as symlinks do not work @@ -43,4 +47,4 @@ package() { cd "$pkgname-$pkgver" python -m installer --destdir="$pkgdir" dist/*.whl install -vDm 644 docs/_build/man/archinstall.1 -t "$pkgdir/usr/share/man/man1/" -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2