[arch-commits] Commit in nextcloud-app-calendar/trunk (PKGBUILD)

[David Runge]

    Date: Sunday, May 8, 2022 @ 20:17:55
  Author: dvzrv
Revision: 1196298

upgpkg: nextcloud-app-calendar 1:3.3.0-3: Rebuild to fix issues in version detection for php-interpreter.

Modified:
  nextcloud-app-calendar/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-08 20:06:17 UTC (rev 1196297)
+++ PKGBUILD	2022-05-08 20:17:55 UTC (rev 1196298)
@@ -4,7 +4,7 @@
 _name=calendar
 epoch=1
 pkgver=3.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Calendar app for nextcloud"
 arch=('any')
 url="https://github.com/nextcloud/calendar/"
@@ -26,7 +26,12 @@
   local _phps=(php7 php)
 
   _app_min_php="$(xq '.info.dependencies.php["@min-version"]' "$_name/appinfo/info.xml"| sed 's/"//g')"
-  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' "$_name/appinfo/info.xml"| sed 's/"//g' | awk -F '.' '{print $1"."$2+1}')"
+  _app_max_php="$(xq '.info.dependencies.php["@max-version"]' "$_name/appinfo/info.xml"| sed 's/"//g')"
+
+  if [[ $_app_max_php != 'null' ]]; then
+    _app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')"
+  fi
+
   _system_php=""
   for _php in "${_phps[@]}"; do
     if command -v "$_php" > /dev/null; then
@@ -55,8 +60,8 @@
     exit 1
   fi
   if [[ $_app_max_php != 'null' ]]; then
-    if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then
-      printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname $_app_min_php $_php_version
+    if [[ "$(vercmp "$_php_version" "$_app_max_php")" -ge 0 ]]; then
+      printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname $_app_max_php $_php_version
       exit 1
     fi
   fi