integration-google: update to 1.0.8

2 files changed, 60 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b66ba2990c0..418c690153bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = nextcloud-app-integration-google
 	pkgdesc = Google integration in Nextcloud
-	pkgver = 1.0.6
+	pkgver = 1.0.8
 	pkgrel = 1
 	url = https://github.com/nextcloud/integration_google
 	arch = any
 	license = AGPL3
-	depends = nextcloud
+	makedepends = nextcloud
+	makedepends = yq
 	options = !strip
-	source = integration_google-v1.0.6.tar.gz::https://github.com/nextcloud/integration_google/releases/download/v1.0.6/integration_google-1.0.6.tar.gz
-	sha512sums = 62c8abde744569a473144effcfdb2dfe71830e89973449e9b4280598bff6f7bbd1739a507ab23a0dd5577d9e90706ac78e231a2abbaf05fe2b1e22add3668c37
+	source = nextcloud-app-integration-google-1.0.8.tar.gz::https://github.com/nextcloud/integration_google/releases/download/v1.0.8/integration_google-1.0.8.tar.gz
+	sha512sums = 54736b8fb2f744652faf6c84282291c707858a659b09da437916780daf5a6564acb3b4199c484bec9dbe96a4f27f07d796934f2d10c0583a36118a3129f28d23
 
 pkgname = nextcloud-app-integration-google
diff --git a/PKGBUILD b/PKGBUILD
index b84b1a42485e..1f61dd7f7beb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,63 @@
-# Maintainer: Anty0 <anty150 at gmail dot com>
+# Contributor: Lex Black <autumn-wind@web.de>
+# Contributor: Anty0 <anty150 at gmail dot com>
 
-
-# Helper variables for updaurpkg (https://aur.archlinux.org/packages/updaurpkg-git)
-_nextcloud_appname='integration_google'
-_upstreamver='v1.0.6'
-_upstreamver_regex='^v[0-9]+\.[0-9]+\.[0-9]+$'
-_source_type='github-releases'
-_repo='nextcloud/integration_google'
-
-
-pkgdesc='Google integration in Nextcloud'
-pkgname=('nextcloud-app-integration-google')
-pkgver="${_upstreamver:1}"
+_name=integration_google
+pkgname=nextcloud-app-integration-google
+pkgver=1.0.8
 pkgrel=1
+pkgdesc="Google integration in Nextcloud"
 arch=('any')
+url="https://github.com/nextcloud/integration_google"
 license=('AGPL3')
-url="https://github.com/${_repo}"
-makedepends=()
-depends=('nextcloud')
+makedepends=('nextcloud' 'yq')
 options=('!strip')
-source=("${_nextcloud_appname}-v${pkgver}.tar.gz::${url}/releases/download/v${pkgver}/${_nextcloud_appname}-${pkgver}.tar.gz")
-sha512sums=('62c8abde744569a473144effcfdb2dfe71830e89973449e9b4280598bff6f7bbd1739a507ab23a0dd5577d9e90706ac78e231a2abbaf05fe2b1e22add3668c37')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/releases/download/v${pkgver}/${_name}-${pkgver}.tar.gz")
+sha512sums=('54736b8fb2f744652faf6c84282291c707858a659b09da437916780daf5a6564acb3b4199c484bec9dbe96a4f27f07d796934f2d10c0583a36118a3129f28d23')
+
+
+# BEGIN boilerplate nextcloud app version clamping, see also other packages in group
+# 1. Call respective function helpers in check() and package() *after* cd'ing to the source directory
+# 2. Add makedepends+=(nextcloud yq)
+_phps=(php7 php)
+_get_supported_ranges() {
+  _app_min_nextcloud="$(< appinfo/info.xml xq -r '.info.dependencies.nextcloud["@min-version"] | values')"
+  _app_max_nextcloud="$(< appinfo/info.xml xq -r '.info.dependencies.nextcloud["@max-version"] | values | tonumber | .+1')"
+  _app_min_php="$(< appinfo/info.xml xq -r '.info.dependencies.php["@min-version"] | values')"
+  _app_max_php="$(< appinfo/info.xml xq -r '.info.dependencies.php["@max-version"] | values | tonumber | .+0.1')"
+}
+_unsupported_range() {
+  printf "%s requires %s %s, but %s %s is provided.\n" "$pkgname" "$1" "$2" "$1" "$3"
+  exit 1
+}
+_nextcloud_app_check() {
+  _get_supported_ranges
+  for _php in "${_phps[@]}"; do command -v "$_php" > /dev/null && break; done
+  local _nextcloud_ver="$("$_php" <(cat /usr/share/webapps/nextcloud/version.php; echo 'print($OC_VersionString);'))"
+  local _php_ver="$("$_php" -r 'print(phpversion());')"
+  [[ "$(vercmp "${_app_min_nextcloud:-0}" "$_nextcloud_ver")" -le 0 ]] || \
+    _unsupported_range nextcloud "=> $_app_min_nextcloud" "$_nextcloud_ver"
+  [[ "$(vercmp "${_app_max_nextcloud:-999}" "$_nextcloud_ver")" -gt 0 ]] || \
+    _unsupported_range nextcloud "< $_app_max_nextcloud" "$_nextcloud_ver"
+  [[ "$(vercmp "${_app_min_php:-0}" "$_php_ver")" -le 0 ]] || \
+    _unsupported_range php ">= $_app_min_php" "$_php_ver"
+  [[ "$(vercmp "${_app_max_php:-999}" "$_php_ver")" -gt 0 ]] || \
+    _unsupported_range php "< $_app_max_php" "$_php_ver"
+}
+_nextcloud_app_package() {
+  _get_supported_ranges
+  depends+=("nextcloud>=${_app_min_nextcloud:-0}" "nextcloud<${_app_max_nextcloud:-999}")
+  depends+=("php-interpreter${_app_min_php:+>=$_app_min_php}" ${_app_max_php:+"php-interpreter<$_app_max_php"})
+}
+# END boilerplate nextcloud app version clamping
+
+check() {
+  cd $_name
+  _nextcloud_app_check
+}
 
 package() {
-	install -d "${pkgdir}/usr/share/webapps/nextcloud/apps"
-	cp -a "${srcdir}/${_nextcloud_appname}" "${pkgdir}/usr/share/webapps/nextcloud/apps/${_nextcloud_appname}"
+  install -vdm 755 "$pkgdir/usr/share/webapps/nextcloud/apps/"
+  cp -av $_name "$pkgdir/usr/share/webapps/nextcloud/apps/"
+  cd $_name
+  _nextcloud_app_package
 }