update to 0.7.1

3 files changed, 28 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a49ff1f299dd..4e09c3f9cac9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = ergo
 	pkgdesc = List of utilities for the daily developer workflow
-	pkgver = 0.4.0
+	pkgver = 0.7.1
 	pkgrel = 1
 	url = https://github.com/beatlabs/ergo
+	install = ergo.install
 	arch = x86_64
 	license = BSD
 	makedepends = go
 	depends = glibc
-	source = ergo-0.4.0.tar.gz::https://github.com/beatlabs/ergo/archive/0.4.0.tar.gz
-	sha256sums = f9492e454f42e6cfda49fcb7a3397c84096be63d11feab7c8c0bdc4778a450f6
+	source = ergo-0.7.1.tar.gz::https://github.com/beatlabs/ergo/archive/v0.7.1.tar.gz
+	sha256sums = 2c1a880a715695bbfd1adf28949b83ec7b7533a5e3acb0a72be8072eea307712
 
 pkgname = ergo
-
diff --git a/PKGBUILD b/PKGBUILD
index 467878efb7c3..6eab106cbb03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Dimitris Kiziridis <ragouel at outlook dot com>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contrbutor: Dimitris Kiziridis <ragouel at outlook dot com>
 
 pkgname=ergo
-pkgver=0.4.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="List of utilities for the daily developer workflow"
 arch=('x86_64')
@@ -9,26 +10,30 @@ url='https://github.com/beatlabs/ergo'
 license=('BSD')
 depends=('glibc')
 makedepends=('go')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
-sha256sums=('f9492e454f42e6cfda49fcb7a3397c84096be63d11feab7c8c0bdc4778a450f6')
+install=ergo.install
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha256sums=('2c1a880a715695bbfd1adf28949b83ec7b7533a5e3acb0a72be8072eea307712')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
   mkdir -p build/
+	go mod tidy
+	go generate ./...
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
   export CGO_LDFLAGS="${LDFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-  go build -o build ./cmd/...
+  go build -o build/ergo -ldflags "-linkmode=external -X main.version=$pkgver" ./cmd/cli
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -Dm755 build/cli "${pkgdir}/usr/bin/ergo"
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/ergo/LICENSE"
-}
\ No newline at end of file
+  cd "$pkgname-$pkgver"
+  install -D "build/$pkgname" -t "$pkgdir/usr/bin/"
+  install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dm644 .ergo.yml.dist "$pkgdir/usr/share/$pkgname/config-template.yml"
+}
diff --git a/ergo.install b/ergo.install
new file mode 100644
index 000000000000..ecd61e436c88
--- /dev/null
+++ b/ergo.install
@@ -0,0 +1,8 @@
+post_install() {
+	echo ':: Your configuration file must be in $HOME/.ergo.yml for the binary to function.'
+	echo ':: You can find a template under /usr/share/ergo/config-template.yml.'
+}
+
+post_upgrade() {
+	post_install
+}