summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Martinez2022-03-13 13:29:21 -0500
committerLuis Martinez2022-03-13 13:29:21 -0500
commit0b1243f8a3c730e54fd5e48867f3ee26a180ba6a (patch)
tree2401786b93a094c8a765097a4404a15d9cf11ebf
parentfab59b220128ee9d0be0946d554cfbd4967cd8fa (diff)
downloadaur-0b1243f8a3c730e54fd5e48867f3ee26a180ba6a.tar.gz
fix and update package
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD22
-rw-r--r--hilbish.install (renamed from hilbish-git.install)0
3 files changed, 18 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3db6c98b9280..a1052161336a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
pkgbase = hilbish-git
pkgdesc = The flower shell for Lua users
- pkgver = 0.5.1.r64.gb97e1ef
+ pkgver = 1.0.4.r3.g0113a4e
pkgrel = 1
url = https://github.com/rosettea/hilbish
- install = hilbish-git.install
+ install = hilbish.install
arch = x86_64
+ arch = i686
arch = aarch64
license = MIT
makedepends = git
- makedepends = go>=1.16
- depends = readline
+ makedepends = go
depends = lua-lunacolors
depends = lua-succulent
+ depends = lua-inspect
provides = hilbish
conflicts = hilbish
options = !emptydirs
source = hilbish-git::git+https://github.com/rosettea/hilbish?signed
- validpgpkeys = 098F50DFBCEEC71A4EAB6DA450EE40A2809851F5
+ validpgpkeys = 784DF7A14968C5094E16839C904FC49417B44DCD
sha256sums = SKIP
pkgname = hilbish-git
diff --git a/PKGBUILD b/PKGBUILD
index 9e04786d149b..924280b75a0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,21 @@
# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
pkgname=hilbish-git
-pkgver=0.5.1.r64.gb97e1ef
+pkgver=1.0.4.r3.g0113a4e
pkgrel=1
pkgdesc="The flower shell for Lua users"
-arch=('x86_64' 'aarch64')
+arch=('x86_64' 'i686' 'aarch64')
url="https://github.com/rosettea/hilbish"
license=('MIT')
-depends=('readline' 'lua-lunacolors' 'lua-succulent')
-makedepends=('git' 'go>=1.16')
+depends=('lua-lunacolors' 'lua-succulent' 'lua-inspect')
+makedepends=('git' 'go')
provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
-install="$pkgname.install"
+install=hilbish.install
options=('!emptydirs')
source=("$pkgname::git+$url?signed")
sha256sums=('SKIP')
-validpgpkeys=('098F50DFBCEEC71A4EAB6DA450EE40A2809851F5')
+validpgpkeys=('784DF7A14968C5094E16839C904FC49417B44DCD') ## TorchedSammy
pkgver() {
git -C "$pkgname" describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./'
@@ -24,6 +24,7 @@ pkgver() {
prepare() {
cd "$pkgname"
sed -i '\|/etc/shells|d' Makefile
+ go mod download
}
build() {
@@ -31,15 +32,16 @@ build() {
export CGO_CFLAGS="${CFLAGS}"
export CGO_CXXFLAGS="${CXXFLAGS}"
export CGO_LDFLAGS="${LDFLAGS}"
- export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+ export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
cd "$pkgname"
- make dev
+ # make dev
+ go build -ldflags "-linkmode=external -X main.version=$pkgver"
}
package() {
cd "$pkgname"
DESTDIR="$pkgdir/" make install
- install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
- install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+ install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+ install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
}
diff --git a/hilbish-git.install b/hilbish.install
index cbb25de224ba..cbb25de224ba 100644
--- a/hilbish-git.install
+++ b/hilbish.install