From baa95866d483da215ae333ae032cc5a4add28685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 26 Apr 2024 23:47:57 +0200 Subject: [PATCH] Remove unneded experimental helper and update requirement --- manifest.toml | 2 +- scripts/experimental_helper.sh | 27 --------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/manifest.toml b/manifest.toml index e1ede2c..ccdc50f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,7 +20,7 @@ code = "https://github.com/mikaku/Monitorix" cpe = "cpe:2.3:a:fibranet:monitorix" [integration] -yunohost = ">= 11.0.11" +yunohost = ">= 11.2.11" architectures = "all" multi_instance = false ldap = "not_relevant" diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh index 107ac88..bfdd78d 100644 --- a/scripts/experimental_helper.sh +++ b/scripts/experimental_helper.sh @@ -133,30 +133,3 @@ ynh_add_jinja_config() { ) ynh_store_file_checksum --file="$destination" } - -# Check either a package is installed or not -# -# example: ynh_package_is_installed --package=yunohost && echo "installed" -# -# usage: ynh_package_is_installed --package=name [--wait_dpkg_free] -# | arg: -p, --package= - the package name to check -# | arg: -l, --wait_dpkg_free= - wait for dpkg to be free. -# | Note that waiting on dpkg free could take about 0.2s on quick platform -# | and about 2 seconds on slow platform so in case of multiple call it could be slow -# | ret: 0 if the package is installed, 1 else. -ynh_package_is_installed() { - # Declare an array to define the options of this helper. - local legacy_args=pl - local -A args_array=([p]=package= [l]=wait_dpkg_free=) - local package - local wait_dpkg_free - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - wait_dpkg_free="${wait_dpkg_free:-0}" - - if [ "$wait_dpkg_free" -eq 1 ]; then - ynh_wait_dpkg_free - fi - dpkg-query --show --showformat='${Status}' "$package" 2>/dev/null \ - | grep --count "ok installed" &>/dev/null -}