summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilhelm Schuster2024-01-03 11:15:19 +0100
committerWilhelm Schuster2024-01-03 11:15:19 +0100
commitf67da3ab47c0cec061524b0165f0e61ee183aeca (patch)
tree2bdf0af948ed00a079f1d11709c29c97842cc262
parent086dd2a524dbc1cf569a381cfe50fc8788bca680 (diff)
downloadaur-f67da3ab47c0cec061524b0165f0e61ee183aeca.tar.gz
Move wheel clean up to build()
This allows repeated calls to `makepkg -R`.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD11
2 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d2568c844de7..3921161e68b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = moonraker-git
pkgdesc = HTTP frontend for Klipper 3D printer firmware
pkgver = r1950.84a8538
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/Arksine/moonraker
install = moonraker.install
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 94cf6bf50c1d..b8d2b6b5d223 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=moonraker
pkgname="${_pkgname}-git"
pkgver=r1950.84a8538
-pkgrel=1
+pkgrel=2
pkgdesc="HTTP frontend for Klipper 3D printer firmware"
arch=(any)
url="https://github.com/Arksine/moonraker"
@@ -56,6 +56,11 @@ pkgver() {
build() {
cd "$srcdir/$_pkgname"
+ # clean wheel before build to prevent later package() runs from erroring due
+ # to `dist/*.whl` expanding to multiple files (which `python -m install` later
+ # doesn't support)
+ rm -f dist/*.whl
+
python -m build --wheel --no-isolation
}
@@ -68,10 +73,6 @@ package() {
cd "$srcdir/$_pkgname"
python -m installer --destdir="${pkgdir}" --prefix="/opt/$_pkgname" dist/*.whl
- # clean wheel after installation to prevent later package() runs from erroring
- # due to `dist/*.whl` expanding to multiple files (which `python -m install`
- # doesn't support)
- rm -f dist/*.whl
rm -rf "$pkgdir/opt/$_pkgname/bin" # clean bin/moonraker as it doesn't work with /opt prefix