summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2022-02-28 22:10:42 +0100
committerErich Eckner <git@eckner.net>2022-02-28 22:13:34 +0100
commit293027376aac79a7000cb79f2caa6b7e31f043e7 (patch)
treee29824167bea6d8384cb356c4f148954ecb521ee
parent99216b5daf9f1c7a0dbce1c6d54345be1ea71e17 (diff)
downloadarchlinuxewe-293027376aac79a7000cb79f2caa6b7e31f043e7.tar.xz
fpc-src-svn: keep commit hash in pkgver
-rw-r--r--fpc-src-svn/PKGBUILD15
1 files changed, 10 insertions, 5 deletions
diff --git a/fpc-src-svn/PKGBUILD b/fpc-src-svn/PKGBUILD
index 333602698..30eb6f2f0 100644
--- a/fpc-src-svn/PKGBUILD
+++ b/fpc-src-svn/PKGBUILD
@@ -9,7 +9,7 @@
# See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc
pkgname='fpc-src-svn'
-pkgver=3.3.1.r10652
+pkgver=3.3.1.r10652.6f749cf4
_pkgver="${pkgver%.r*}"
_commit="${pkgver##*.}"
pkgrel=1
@@ -36,12 +36,17 @@ pkgver() {
| sort -V \
| tail -n1
)
+ _commit=$(
+ git rev-parse "${_commit}" \
+ | cut -c1-8
+ )
revision=$(
- git rev-list --count "${_commit/HEAD/main}" "^${last_version}"
+ git rev-list --count "${_commit}" "^${last_version}"
)
- printf '%s.r%s' \
- ${last_version} \
- ${revision}
+ printf '%s.r%s.%s' \
+ "${last_version}" \
+ "${revision}" \
+ "${_commit}"
}
prepare() {