diff options
| author | Tom Whitwell | 2020-02-14 14:06:47 +0000 |
|---|---|---|
| committer | Tom Whitwell | 2020-02-14 14:06:47 +0000 |
| commit | a7d367d43ed7a9cf9beab2c367ebbfa03d804fdb (patch) | |
| tree | 321dc7562f2a7d2569eb9eba687b3b920c3d9951 | |
| parent | 4dce97bd033feb7f2c1be3c8b1b22a2a9feede7b (diff) | |
| download | aur-a7d367d43ed7a9cf9beab2c367ebbfa03d804fdb.tar.gz | |
Actually fix up the versioning to be *actually* correct
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -1,6 +1,6 @@ pkgbase = gds-cli-git pkgdesc = CLI for GDS Staff - pkgver = r539.0d39742 + pkgver = 2.5.0.r4.g0d39742 pkgrel = 1 url = https://github.com/alphagov/gds-cli arch = i686 @@ -11,7 +11,7 @@ pkgbase = gds-cli-git optdepends = aws-cli: CLI for Amazon AWS optdepends = aws-vault: Manager for AWS Credentials optdepends = yubikey-manager: Manager for yubikey - provides = gds-cli=r539.0d39742 + provides = gds-cli=2.5.0.r4.g0d39742 conflicts = gds-cli source = gds-cli-git::git+https://github.com/alphagov/gds-cli sha512sums = SKIP @@ -1,6 +1,6 @@ # Maintainer: Tom Whitwell <tom.whitwell@digital.cabinet-office.gov.uk> pkgname=gds-cli-git -pkgver=r539.0d39742 +pkgver=2.5.0.r4.g0d39742 pkgrel=1 pkgdesc="CLI for GDS Staff" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ sha512sums=('SKIP') pkgver() { pushd "${srcdir}/${pkgname}" >/dev/null { - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | sed 's/^v\(.*\)/\1/' } popd >/dev/null } |