diff options
| author | Sebastian 'gonX' Jensen | 2022-11-14 23:14:46 +0100 |
|---|---|---|
| committer | Sebastian 'gonX' Jensen | 2022-11-14 23:16:06 +0100 |
| commit | a07e1ccc7957789e6c205989e3f70c1e9201fad2 (patch) | |
| tree | be7453f9e3374fc220240d27cc9295acf7589459 | |
| parent | 36a233b60c6d0c7c4a9cf6c0843eccdf08541794 (diff) | |
| download | aur-a07e1ccc7957789e6c205989e3f70c1e9201fad2.tar.gz | |
Fix 0.7.0.0pre versioning
I misinterpreted git-describe documentation, which would have
resulted in the revision count never changing. It was counting
number of commits between the DI rewrite and 0.6.0.4, rather
than number of commits since the DI rewrite.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 9 |
2 files changed, 8 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = opentabletdriver-git pkgdesc = A cross-platform open source tablet driver - pkgver = v0.7.0.0pre.r21.g10a3c072 - pkgrel = 2 + pkgver = v0.7.0.0pre.r163.gd50c1324 + pkgrel = 3 url = https://github.com/OpenTabletDriver/OpenTabletDriver install = notes.install arch = x86_64 @@ -5,8 +5,8 @@ pkgname=opentabletdriver-git _pkgname=OpenTabletDriver _lpkgname=opentabletdriver _spkgname=otd -pkgver=v0.7.0.0pre.r21.g10a3c072 -pkgrel=2 +pkgver=v0.7.0.0pre.r163.gd50c1324 +pkgrel=3 pkgdesc="A cross-platform open source tablet driver" arch=('x86_64') url="https://github.com/OpenTabletDriver/OpenTabletDriver" @@ -36,7 +36,10 @@ pkgver() { cd "$srcdir/$_pkgname" # check for the DI rewrite commit that makes plugins incompatible if git merge-base --is-ancestor 10a3c07206028f7df5befbdeca6aadb30efe4cb3 HEAD >/dev/null; then - git describe --long --tags 10a3c07206028f7df5befbdeca6aadb30efe4cb3 | sed 's/0.6.0.4/0.7.0.0pre/' | sed 's/\([^-]*-g\)/r\1/;s/-/./g' + printf "%s.r%s.g%s\n" \ + "v0.7.0.0pre" \ + $(git log --oneline 10a3c072.. | wc -l) \ + $(git describe --long --tags | sed 's/.*-g\(.*\)/\1/') else git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' fi |