Date: Wednesday, June 15, 2022 @ 21:32:58 Author: dvzrv Revision: 1238054
upgpkg: nextcloud-app-news 18.1.0-1: Upgrade to 18.1.0. Replace custom dependency checks with unified boilerplate for nextcloud apps. Modified: nextcloud-app-news/trunk/PKGBUILD ----------+ PKGBUILD | 116 ++++++++++++++++++++++--------------------------------------- 1 file changed, 43 insertions(+), 73 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-15 21:11:31 UTC (rev 1238053) +++ PKGBUILD 2022-06-15 21:32:58 UTC (rev 1238054) @@ -3,90 +3,60 @@ pkgname=nextcloud-app-news _name=news -pkgver=18.0.1 -pkgrel=2 +pkgver=18.1.0 +pkgrel=1 pkgdesc="An RSS/Atom feed aggregator" arch=(any) url="https://github.com/nextcloud/news"; license=(AGPL3) -makedepends=(nextcloud ripgrep yq) +makedepends=(nextcloud yq) source=($pkgname-$pkgver.tar.gz::https://github.com/nextcloud/$_name/releases/download/$pkgver/$_name.tar.gz) -sha512sums=('18ebcc06e5b46dbea4295b5b0ba78cd1e71c77fb3492eca5ffaacf7d760ca98fbb8514f687400df58dd883ccd9f7b20e229935ce9e62c4343be8df01375b6cd1') -b2sums=('3c178c99788dda43cb02bc56c57e86df106e96a7b51f63049dbde8d30d14a51d00ed8327e29a2922803532b12bc1b69bf95a816e4c7a2a08cf72f21b5ed16c5e') +sha512sums=('dec67c1ef538f6eb73da294585f32670709ec97f7372e9457cc0a72eb85b4ff47790f7a9fe54e4683638c877455b20ae6fc2ce7d5c38d47ce42874857564a6a5') +b2sums=('9a7a8872fe11c3d3bd6260df487d4c50827cd195857edfbe14d00da20ea8e50393e8e572c04f0c12c2a7eda81bc4666c9c3d2ffb204ead582faade109b3e4460') -_get_nextcloud_versions() { - _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' "${_name}/appinfo/info.xml"| sed 's/"//g')" - _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' "${_name}/appinfo/info.xml"| sed 's/"//g')" - _app_max_major_version=$(expr ${_app_max_major_version} + 1) +# 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')" } - -_get_php_versions() { - 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')" - - 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 - if [[ -z "$_system_php" ]]; then - _system_php="$_php" - fi - fi - done +_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() { - local _app_min_major_version - local _app_max_major_version - _get_nextcloud_versions - _get_php_versions - - local _nextcloud_major_version="$(rg "OC_Version = " /usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)" - if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" -lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" "${_app_max_major_version}")" -gt 0 ]] ; then - printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" "${_nextcloud_major_version}" - exit 1 - fi - - local _php_version="$(php --version |head -n1 |cut -d ' ' -f2 |sed 's/.[0-9]*$//g')" - 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 - exit 1 - fi - if [[ $_app_max_php != 'null' ]]; then - 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 + cd $_name + _nextcloud_app_check } package() { - _get_nextcloud_versions - _get_php_versions - - depends=( - "nextcloud>=${_app_min_major_version}" - "nextcloud<${_app_max_major_version}" - ) - if [[ "$_app_min_php" != 'null' ]]; then - depends+=( - "php-interpreter>=$_app_min_php" - ) - fi - if [[ "$_app_max_php" != 'null' ]]; then - depends+=( - "php-interpreter<$_app_max_php" - ) - fi - if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then - depends+=(php-interpreter) - fi - - install -vdm 755 "${pkgdir}/usr/share/webapps/nextcloud/apps" - cp -av "${_name}" "${pkgdir}/usr/share/webapps/nextcloud/apps/" + install -vdm 755 "$pkgdir/usr/share/webapps/nextcloud/apps/" + cp -av $_name "$pkgdir/usr/share/webapps/nextcloud/apps/" + cd $_name + _nextcloud_app_package }
