summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Rawlinson2021-09-01 07:39:53 +0000
committerGeorge Rawlinson2021-09-01 07:39:53 +0000
commit335db3ac0706198f9e21224b4051f1a64f9eb6b8 (patch)
treef55a22aaad8f7ee4a3c8113cb0bca01233ff8be0
parent37691988ebe671f780667483a9ff0e16617cf9c8 (diff)
downloadaur-335db3ac0706198f9e21224b4051f1a64f9eb6b8.tar.gz
upgpkg: bat-extras 2021.08.21-2
* Add fish to checkdepends. * Move required optdepends to depends. * Download required git submodules. * Switch to git submodules instead of several tarballs.
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD30
2 files changed, 29 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f46d96fe970..e062f15c23c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
pkgbase = bat-extras
pkgdesc = Bash scripts that integrate bat with various command line tools
pkgver = 2021.08.21
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/eth-p/bat-extras
arch = any
license = MIT
+ checkdepends = fish
depends = bat
depends = bash
- optdepends = git: required for batdiff script
- optdepends = ripgrep: required for batgrep script
- optdepends = man-db: required for batman script
+ depends = git
+ depends = ripgrep
+ depends = man-db
optdepends = ncurses: optional for batdiff script
optdepends = git-delta: optional for batdiff script
optdepends = fzf: optional for batman script
@@ -20,7 +21,7 @@ pkgbase = bat-extras
optdepends = rustfmt: Rust formatting for prettybat script
optdepends = clang: C / C++ / Objective-C formatting for prettybat script
optdepends = python-black: Python formatting for prettybat script
- source = bat-extras-2021.08.21.tar.gz::https://github.com/eth-p/bat-extras/archive/v2021.08.21.tar.gz
- b2sums = 6df434fb800f1c0c56731237801348d97d6fbb5652b2315b64f9c172533de01e59a1ec37f11d5d6d9ac91aaf389185b275554deb8ae598c203a5c1419c462d27
+ source = git+https://github.com/eth-p/bat-extras.git#commit=7803ecaba1e78adacc277e82b2568cca007b1ba0
+ b2sums = SKIP
pkgname = bat-extras
diff --git a/PKGBUILD b/PKGBUILD
index bf13563c46b4..4fbbf87fcc17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,13 @@
pkgname=bat-extras
pkgver=2021.08.21
-pkgrel=1
+pkgrel=2
pkgdesc="Bash scripts that integrate bat with various command line tools"
arch=('any')
url="https://github.com/eth-p/bat-extras"
license=('MIT')
-depends=('bat' 'bash')
+depends=('bat' 'bash' 'git' 'ripgrep' 'man-db')
optdepends=(
- 'git: required for batdiff script'
- 'ripgrep: required for batgrep script'
- 'man-db: required for batman script'
'ncurses: optional for batdiff script'
'git-delta: optional for batdiff script'
'fzf: optional for batman script'
@@ -23,11 +20,28 @@ optdepends=(
'clang: C / C++ / Objective-C formatting for prettybat script'
'python-black: Python formatting for prettybat script'
)
-source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
-b2sums=('6df434fb800f1c0c56731237801348d97d6fbb5652b2315b64f9c172533de01e59a1ec37f11d5d6d9ac91aaf389185b275554deb8ae598c203a5c1419c462d27')
+checkdepends=('fish')
+_commit='7803ecaba1e78adacc277e82b2568cca007b1ba0'
+source=("git+$url.git#commit=$_commit")
+b2sums=('SKIP')
+
+pkgver() {
+ cd "$pkgname"
+ git describe --tags | sed 's/^[vV]//;s/-/+/g'
+}
+
+prepare(){
+ cd "$pkgname"
+ git submodule update --init --recursive
+}
+
+check() {
+ cd "$pkgname"
+ ./test.sh --verbose --strict --snapshot:show
+}
package() {
- cd "$pkgname-$pkgver"
+ cd "$pkgname"
./build.sh \
--minify=none \
--no-verify \