summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorShizcow2020-07-02 11:58:54 -0600
committerShizcow2020-07-02 12:05:48 -0600
commit142936fad5bc8fc37025b214d1d8d854229f2492 (patch)
tree7d6bf88f064c3afbcdfd0e95fa3fe146372d9b27
parent022f1cef90a9f4dc50a1563ca08edcd1edd80d0f (diff)
downloadaur-142936fad5bc8fc37025b214d1d8d854229f2492.tar.gz
Upstream: Merge pull request #11 from Shizcow/bugfix/dmenu_launches_on_incorrect_monitormenu now launches on correct monitor
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
2 files changed, 7 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 80af1dfd4e9c..71c824398eb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = dmenu-rs-git
pkgdesc = The development branch of dmenu-rs. Likely has unstable features.
- pkgver = 5.2.2.11.g3493cbe
+ pkgver = 5.2.3.r209.3493cbe
pkgrel = 1
url = https://github.com/Shizcow/dmenu-rs
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 45568af4c0e0..b6555450b7af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ PLUGINS=""
_pkgname=dmenu
_pkgbase=$_pkgname-rs
pkgname=$_pkgbase-git
-pkgver=5.2.2.11.g3493cbe
+pkgver=5.2.3.r209.3493cbe
pkgrel=1
pkgdesc="The development branch of dmenu-rs. Likely has unstable features."
arch=('i686' 'x86_64')
@@ -26,8 +26,12 @@ md5sums=('SKIP')
pkgver() {
cd $_pkgbase
+ # first get the most recent tag from master
+ git checkout master > /dev/null
+ git describe --tags | tr -d '\n'
+ # then get the commit hash from development branch
git checkout develop > /dev/null
- git describe --tags --long | sed 's/-/./g'
+ printf ".r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
prepare() (