make pkgver auto-update with what you downloaded

2 files changed, 13 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7398a9de87de..11d0fc1d6ea0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = p4
 	pkgdesc = Perforce command line client
-	pkgver = 2019.2.1885864
+	pkgver = 2019.2.1897966
 	pkgrel = 1
 	url = http://www.perforce.com
 	arch = i686
@@ -11,12 +11,12 @@ pkgbase = p4
 	validpgpkeys = 7123CB760FF18869
 	validpgpkeys = E58131C0AEA7B082C6DC4C937123CB760FF18869
 	sha256sums = c4ed3aef62b1bbf2d16ce4cceb65dc49ab9635b38e2fed0a595fe259283a9f32
-	source_i686 = 2019.2.1885864-p4::http://www.perforce.com/downloads/perforce/r19.2/bin.linux26x86/p4
-	source_i686 = 2019.2.1885864-p4.asc::http://www.perforce.com/downloads/perforce/r19.2/bin.linux26x86/p4.asc
+	source_i686 = 19.2-20200109-p4::http://www.perforce.com/downloads/perforce/r19.2/bin.linux26x86/p4
+	source_i686 = 19.2-20200109-p4.asc::http://www.perforce.com/downloads/perforce/r19.2/bin.linux26x86/p4.asc
 	sha256sums_i686 = SKIP
 	sha256sums_i686 = SKIP
-	source_x86_64 = 2019.2.1885864-p4::http://www.perforce.com/downloads/perforce/r19.2/bin.linux26x86_64/p4
-	source_x86_64 = 2019.2.1885864-p4.asc::http://www.perforce.com/downloads/perforce/r19.2/bin.linux26x86_64/p4.asc
+	source_x86_64 = 19.2-20200109-p4::http://www.perforce.com/downloads/perforce/r19.2/bin.linux26x86_64/p4
+	source_x86_64 = 19.2-20200109-p4.asc::http://www.perforce.com/downloads/perforce/r19.2/bin.linux26x86_64/p4.asc
 	sha256sums_x86_64 = SKIP
 	sha256sums_x86_64 = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 4dd752a2c4da..cfdbcde05f00 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Joel Shapiro <jshapiro at nvidia dot com>
 
 pkgname=p4
-pkgver=2019.2.1885864
+_version=2019.2
+pkgver=2019.2.1897966
 pkgrel=1
 
 pkgdesc="Perforce command line client"
@@ -11,7 +12,7 @@ url="http://www.perforce.com"
 license=('custom:p4')
 
 _url="${url}/downloads/perforce"
-_filename="${pkgver}-${pkgname}"
+_filename="${pkgver:2:4}-$(date +%Y%m%d)-${pkgname}"
 
 source=(LICENSE)
 source_x86_64=("${_filename}"::"${_url}/r${pkgver:2:4}/bin.linux26x86_64/${pkgname}"
@@ -28,6 +29,11 @@ sha256sums_x86_64=('SKIP' 'SKIP')
 validpgpkeys=('7123CB760FF18869'
               'E58131C0AEA7B082C6DC4C937123CB760FF18869')
 
+pkgver() {
+  # grab the build version from the asc file itself
+  echo "${_version}.$(grep "$_version" "${_filename}.asc" | awk -F'/' '{print $NF}')"
+}
+
 package() {
   install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
   install -D -m 755 "${_filename}" "${pkgdir}/usr/bin/${pkgname}"