end2end: Follow PKGBUILDs from repos

2 files changed, 54 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d710b404fff..8df97a094a2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = nextcloud-app-end_to_end_encryption
 	pkgdesc = Nextcloud End-to-End-Encryption App
-	pkgver = 1.0.5
+	pkgver = 1.5.0
 	pkgrel = 1
 	url = https://github.com/nextcloud/end_to_end_encryption
 	arch = any
 	license = AGPLv3
-	depends = nextcloud
+	makedepends = nextcloud
+	makedepends = yq
 	options = !strip
-	source = nextcloud-app-end_to_end_encryption-1.0.5.tar.gz::https://github.com/nextcloud/end_to_end_encryption/releases/download/v1.0.5/end_to_end_encryption-1.0.5.tar.gz
-	sha512sums = 85d9169e1684dbc1f5b2279b22f1ab3ebf6fecd8499061a99236cdf3478c7499b9a27bb36d2f6bbcab9e35735fe155268406ec337fa1bbe02d97d73c513e35a7
+	source = nextcloud-app-end_to_end_encryption-1.5.0.tar.gz::https://github.com/nextcloud/end_to_end_encryption/releases/download/v1.5.0/end_to_end_encryption-1.5.0.tar.gz
+	sha512sums = ecaabeadee469028465abca9a745148bd16f4ab202eea43b07a15edde85c7068bf4047c404f09d73ef3171afd16dbb59cd3b497c1a966ab3e2196b52a2f94929
 
 pkgname = nextcloud-app-end_to_end_encryption
-
diff --git a/PKGBUILD b/PKGBUILD
index 9d4256b8cf05..06051357d8d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,7 @@
-# Maintainer: Christian Steinhaus <aur@anwarias.de>
+# Contributor: Lex Black <autumn-wind@web.de>
 # Contributor: Christian Steinhaus <aur@anwarias.de>
 
+_name=end_to_end_encryption
 pkgname=nextcloud-app-end_to_end_encryption
 pkgver=1.5.0
 pkgrel=1
@@ -8,13 +9,55 @@ pkgdesc="Nextcloud End-to-End-Encryption App"
 arch=('any')
 url="https://github.com/nextcloud/end_to_end_encryption"
 license=('AGPLv3')
-depends=('nextcloud')
-makedepends=()
+makedepends=('nextcloud' 'yq')
 options=('!strip')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/nextcloud/end_to_end_encryption/releases/download/v${pkgver}/end_to_end_encryption-${pkgver}.tar.gz")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/nextcloud/${_name}/releases/download/v${pkgver}/${_name}-${pkgver}.tar.gz")
 sha512sums=('ecaabeadee469028465abca9a745148bd16f4ab202eea43b07a15edde85c7068bf4047c404f09d73ef3171afd16dbb59cd3b497c1a966ab3e2196b52a2f94929')
 
+
+# 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}/end_to_end_encryption" "${pkgdir}/usr/share/webapps/nextcloud/apps/end_to_end_encryption"
+  install -vdm 755 "$pkgdir/usr/share/webapps/nextcloud/apps/"
+  cp -av $_name "$pkgdir/usr/share/webapps/nextcloud/apps/"
+  cd $_name
+  _nextcloud_app_package
 }