summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuijie Yu2021-09-27 18:53:48 -0500
committerRuijie Yu2021-09-27 18:53:48 -0500
commit7c9c857cbaaa98d6f5218720d632fc20e75ccea8 (patch)
tree741f59e4d53dc229ce0f03b19b14bdfaf0f9a823
parent58be4c7c961dc07eef5e7f1de28500f2c78e753e (diff)
downloadaur-bass-fish.tar.gz
PKGBUILD changes
Use upstream `make test` instead of copy pasta Let `install -D ... -t DEST` handle the directory creation
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD27
2 files changed, 12 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 130e46b7037..d131ee57462 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,8 +7,7 @@ pkgbase = bass-fish
license = MIT
checkdepends = python
depends = fish
- source = https://github.com/edc/bass/archive/v1.0.tar.gz
- b2sums = SKIP
+ source = bass-fish-1.0.tar.gz::https://github.com/edc/bass/archive/v1.0.tar.gz
+ b2sums = b2f9e0489f27c22354c8e2a23f5e499bbf54166737a989bd754afa3e22c433a20df7df1708d1a8c59d549bbcf67dadb72632554beec353d3105b74204b2334e9
pkgname = bass-fish
-
diff --git a/PKGBUILD b/PKGBUILD
index c662366ddd5..76fc9ca70cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,10 +14,10 @@ checkdepends=(
python
)
source=(
- "$url/archive/v$pkgver.tar.gz"
+ "$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
)
-b2sums=(SKIP)
+b2sums=('b2f9e0489f27c22354c8e2a23f5e499bbf54166737a989bd754afa3e22c433a20df7df1708d1a8c59d549bbcf67dadb72632554beec353d3105b74204b2334e9')
_extracted="$_pkgname-$pkgver"
_fish_vendor_func="usr/share/fish/vendor_functions.d/"
@@ -25,28 +25,21 @@ _license_dir="usr/share/licenses/$pkgname/"
_doc_dir="usr/share/doc/$pkgname/"
check() {
- _test_path="$srcdir/$_extracted/test"
- fish "$_test_path/test_bass.fish" &&
- fish "$_test_path/test_dollar_on_output.fish"
+ make -C "$srcdir/$_extracted" test # call test target from upstream
}
package() {
- install -dm0755 \
- "$pkgdir/$_fish_vendor_func" \
- "$pkgdir/$_license_dir" \
- "$pkgdir/$_doc_dir"
-
install -Dm0644 \
- "$srcdir/$_extracted/functions/__bass.py" \
- "$srcdir/$_extracted/functions/bass.fish" \
- "$pkgdir/$_fish_vendor_func"
+ "$srcdir/$_extracted/functions/__bass.py" \
+ "$srcdir/$_extracted/functions/bass.fish" \
+ -t "$pkgdir/$_fish_vendor_func/"
install -Dm0644 \
- "$srcdir/$_extracted/LICENSE" \
- "$pkgdir/$_license_dir"
+ "$srcdir/$_extracted/LICENSE" \
+ -t "$pkgdir/$_license_dir/"
install -Dm0644 \
- "$srcdir/$_extracted/README.md" \
- "$pkgdir/$_doc_dir"
+ "$srcdir/$_extracted/README.md" \
+ -t "$pkgdir/$_doc_dir/"
}