summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Sztandera2016-11-06 16:47:19 +0100
committerJakub Sztandera2016-11-06 16:48:57 +0100
commit237bec4c728542a63d5411f28434f895c39d836a (patch)
treec14e65ef6950e9eaf6378f46909835bd14ec2111
parent18ff31a9cef3e15fedb0fd872ac671e0d1f6c442 (diff)
downloadaur-237bec4c728542a63d5411f28434f895c39d836a.tar.gz
Change version read to be package.json based instead of tag
As tags are out-dated during development cycle.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD8
2 files changed, 8 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 244c2ec1e175..a67b9497f597 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Aug 4 14:37:28 UTC 2016
+# Sun Nov 6 15:48:09 UTC 2016
pkgbase = go-ipfs-git
pkgdesc = global versioned p2p merkledag file system
- pkgver = 0.4.3rc2.r0.g813bcb6
+ pkgver = 0.4.5dev.r327.g6779ff1
pkgrel = 1
url = https://github.com/ipfs/go-ipfs
install = go-ipfs-git.install
@@ -12,6 +12,7 @@ pkgbase = go-ipfs-git
license = MIT
makedepends = git
makedepends = go
+ makedepends = jq
optdepends = fuse: for mounting/advanced use
optdepends = bash-completion: bash completion support
provides = go-ipfs
diff --git a/PKGBUILD b/PKGBUILD
index 75fbed4759da..05a005c1e21b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,13 @@
_pkgname=go-ipfs
pkgname=$_pkgname-git
-pkgver=0.4.3rc2.r0.g813bcb6
+pkgver=0.4.5dev.r327.g6779ff1
pkgrel=1
pkgdesc='global versioned p2p merkledag file system'
url="https://github.com/ipfs/$_pkgname"
arch=('i686' 'x86_64' 'armv7h')
license=('MIT')
-makedepends=('git' 'go')
+makedepends=('git' 'go' 'jq')
optdepends=('fuse: for mounting/advanced use'
'bash-completion: bash completion support')
provides=("$_pkgname")
@@ -25,7 +25,9 @@ sha512sums=('SKIP'
pkgver() {
cd "$srcdir/$_pkgname"
- git describe --long --tags | sed -e 's/^v//' -e 's/^\(.*\)-\([0-9]*\)-\(g[0-9a-f]*\)$/\1.r\2.\3/' -e 's/-//g'
+ VERSION=$(jq -r .version package.json)
+ REST=$(git describe --long --tags | sed -e 's/^v//' -e 's/^\(.*\)-\([0-9]*\)-\(g[0-9a-f]*\)$/r\2.\3/')
+ printf "%s.%s" "$VERSION" "$REST" | sed -e 's/-//g'
}
prepare() {