Date: Sunday, May 8, 2022 @ 20:32:50 Author: dvzrv Revision: 1196306 upgpkg: nextcloud-app-news 18.0.1-2: Rebuild to add more specific dependency on php-interpreter.
Implement a versioned dependency on php-interpreter. Modified: nextcloud-app-news/trunk/PKGBUILD ----------+ PKGBUILD | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-05-08 20:29:05 UTC (rev 1196305) +++ PKGBUILD 2022-05-08 20:32:50 UTC (rev 1196306) @@ -4,7 +4,7 @@ pkgname=nextcloud-app-news _name=news pkgver=18.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An RSS/Atom feed aggregator" arch=(any) url="https://github.com/nextcloud/news" @@ -21,8 +21,23 @@ } _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 } check() { @@ -39,12 +54,12 @@ 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 >= %s, but %s is provided\n" $pkgname $_app_min_php $_php_version + 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_min_php" )" -lt 0 ]]; then - printf "%s requires php <= %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 @@ -57,13 +72,20 @@ depends=( "nextcloud>=${_app_min_major_version}" "nextcloud<${_app_max_major_version}" - "php>=$_app_min_php" ) + if [[ "$_app_min_php" != 'null' ]]; then + depends+=( + "php-interpreter>=$_app_min_php" + ) + fi if [[ "$_app_max_php" != 'null' ]]; then depends+=( - "php<=$_app_max_php" + "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/"