summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Peukert2019-12-08 22:13:44 +0100
committerDaniel Peukert2019-12-08 22:13:44 +0100
commitaec12c65fe0868b8455d09bb4652abf415b10e5a (patch)
tree8828899f87fdd0595398d372f1adb89ea06c6517
parent7805069cbc2dd7d909335892f4de77c31632ae29 (diff)
downloadaur-aec12c65fe0868b8455d09bb4652abf415b10e5a.tar.gz
Improved dependencies and PKGBUILD syntax
-rw-r--r--.SRCINFO9
-rw-r--r--.editorconfig1
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD21
4 files changed, 18 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 778505f0e1f5..5aa399d8ac90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = bitw-git
- pkgdesc = Minimalist BitWarden client with Secret Service API implementation
- pkgver = r40.8c8d0e9
+ pkgdesc = Minimalist BitWarden client with Secret Service API implementation - git version
+ pkgver = r46.17ac675
pkgrel = 1
url = https://github.com/mvdan/bitw
arch = x86_64
@@ -11,8 +11,9 @@ pkgbase = bitw-git
arch = aarch64
license = BSD
makedepends = git
- makedepends = go
- source = bitw::git+https://github.com/mvdan/bitw
+ makedepends = go-pie
+ provides = bitw
+ source = bitw-git::git+https://github.com/mvdan/bitw
sha256sums = SKIP
pkgname = bitw-git
diff --git a/.editorconfig b/.editorconfig
index 657972b0a3a1..a467ee9a97a6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,4 +6,3 @@ end_of_line = lf
insert_final_newline = true
indent_style = tab
tab_width = 4
-
diff --git a/.gitignore b/.gitignore
index c32d61df451c..82b3c183d5d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,4 @@
*.log.*
*.sig
-pkg/
-src/
-bitw/
+*/
diff --git a/PKGBUILD b/PKGBUILD
index f76d2b9985ae..6e4b55ef49f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,33 @@
# Maintainer: Daniel Peukert <dan.peukert@gmail.com>
_pkgname='bitw'
pkgname="$_pkgname-git"
-pkgver='r40.8c8d0e9'
+pkgver='r46.17ac675'
pkgrel='1'
-pkgdesc='Minimalist BitWarden client with Secret Service API implementation'
+pkgdesc='Minimalist BitWarden client with Secret Service API implementation - git version'
arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
url="https://github.com/mvdan/$_pkgname"
license=('BSD')
-makedepends=('git' 'go')
-source=("$_pkgname::git+$url")
+makedepends=('git' 'go-pie')
+provides=("$_pkgname")
+source=("$pkgname::git+$url")
sha256sums=('SKIP')
+_sourcedirectory="$pkgname"
+
pkgver() {
- cd "$srcdir/$_pkgname"
+ cd "$srcdir/$_sourcedirectory/"
printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
build() {
- export GOPATH="$srcdir/gopath"
- cd "$srcdir/$_pkgname"
+ cd "$srcdir/$_sourcedirectory/"
+ export GOPATH="$srcdir/$_sourcedirectory-gopath"
go build -gcflags "all=-trimpath=$PWD" -asmflags "all=-trimpath=$PWD" -ldflags "-extldflags $LDFLAGS" -o "$_pkgname" .
}
package() {
- cd "$srcdir/$_pkgname"
- install -Dm644 'LICENSE' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ cd "$srcdir/$_sourcedirectory/"
install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+ install -Dm644 'LICENSE' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
go clean -modcache
}