From 76e8d962e189d635cb904bc2bd1c97ad6b2ba02e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 21 Oct 2022 22:30:42 +0200 Subject: [PATCH] Update official helper list + ignore config panel helpers that may legitimately be overwritten --- package_linter.py | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/package_linter.py b/package_linter.py index a9b2d8d..8c9626e 100755 --- a/package_linter.py +++ b/package_linter.py @@ -21,6 +21,8 @@ from datetime import datetime # for HELPER in $(cat helperlist); do REQUIRE=$(grep -whB5 "^$HELPER" /path/to/yunohost/data/helpers.d/* | grep "Requires .* or higher\." | grep -o -E "[0-9].[0-9].[0-9]"); echo "'$HELPER': '$REQUIRE'",; done | tr "'" '"' official_helpers = { + "ynh_install_apps": "", + "ynh_remove_apps": "", "ynh_wait_dpkg_free": "3.3.1", "ynh_package_is_installed": "2.2.4", "ynh_package_version": "2.2.4", @@ -32,7 +34,6 @@ official_helpers = { "ynh_package_autopurge": "2.7.2", "ynh_package_install_from_equivs": "2.2.4", "ynh_install_app_dependencies": "2.6.4", - "ynh_add_sury": "", "ynh_add_app_dependencies": "3.8.1", "ynh_remove_app_dependencies": "2.6.4", "ynh_install_extra_app_dependencies": "3.8.1", @@ -43,7 +44,6 @@ official_helpers = { "ynh_backup": "2.4.0", "ynh_restore": "2.6.4", "ynh_restore_file": "2.6.4", - "ynh_bind_or_cp": "", "ynh_store_file_checksum": "2.6.4", "ynh_backup_if_checksum_is_different": "2.6.4", "ynh_delete_file_checksum": "3.3.1", @@ -51,13 +51,16 @@ official_helpers = { "ynh_backup_before_upgrade": "2.7.2", "ynh_restore_upgradebackup": "2.7.2", "ynh_app_config_get_one": "", - "ynh_app_config_get": "", - "ynh_app_config_show": "", - "ynh_app_config_validate": "", + # Commenting out config panel helpers + # that may legitimately be overwritten from config script + #"ynh_app_config_get": "", + #"ynh_app_config_show": "", + #"ynh_app_config_validate": "", "ynh_app_config_apply_one": "", - "ynh_app_config_apply": "", - "ynh_app_config_run": "", - "ynh_add_fail2ban_config": "3.5.0", + #"ynh_app_config_apply": "", + #"ynh_app_action_run": "", + #"ynh_app_config_run": "", + "ynh_add_fail2ban_config": "4.1.0", "ynh_remove_fail2ban_config": "3.5.0", "ynh_handle_getopts_args": "3.2.2", "ynh_get_ram": "3.8.1", @@ -78,9 +81,9 @@ official_helpers = { "ynh_return": "3.6.0", "ynh_use_logrotate": "2.6.4", "ynh_remove_logrotate": "2.6.4", - "ynh_multimedia_build_main_dir": "4.2", - "ynh_multimedia_addfolder": "4.2", - "ynh_multimedia_addaccess": "4.2", + "ynh_multimedia_build_main_dir": "", + "ynh_multimedia_addfolder": "", + "ynh_multimedia_addaccess": "", "ynh_mysql_connect_as": "2.2.4", "ynh_mysql_execute_as_root": "2.2.4", "ynh_mysql_execute_file_as_root": "2.2.4", @@ -97,7 +100,7 @@ official_helpers = { "ynh_validate_ip": "2.2.4", "ynh_validate_ip4": "2.2.4", "ynh_validate_ip6": "2.2.4", - "ynh_add_nginx_config": "2.7.2", + "ynh_add_nginx_config": "4.1.0", "ynh_remove_nginx_config": "2.7.2", "ynh_install_n": "2.7.1", "ynh_use_nodejs": "2.7.1", @@ -110,15 +113,15 @@ official_helpers = { "ynh_permission_url": "3.7.0", "ynh_permission_update": "3.7.0", "ynh_permission_has_user": "3.7.1", - "ynh_legacy_permissions_exists": "4.1", - "ynh_legacy_permissions_delete_all": "4.1", - "ynh_add_fpm_config": "2.7.2", + "ynh_legacy_permissions_exists": "4.1.2", + "ynh_legacy_permissions_delete_all": "4.1.2", + "ynh_add_fpm_config": "4.1.0", "ynh_remove_fpm_config": "2.7.2", "ynh_install_php": "3.8.1", "ynh_remove_php": "3.8.1", "ynh_get_scalable_phpfpm": "", - "ynh_composer_exec": "4.2", - "ynh_install_composer": "4.2", + "ynh_composer_exec": "", + "ynh_install_composer": "", "ynh_psql_connect_as": "3.5.0", "ynh_psql_execute_as_root": "3.5.0", "ynh_psql_execute_file_as_root": "3.5.0", @@ -143,7 +146,7 @@ official_helpers = { "ynh_replace_special_string": "2.7.7", "ynh_sanitize_dbid": "2.2.4", "ynh_normalize_url_path": "2.6.4", - "ynh_add_systemd_config": "2.7.1", + "ynh_add_systemd_config": "4.1.0", "ynh_remove_systemd_config": "2.7.2", "ynh_systemd_action": "3.5.0", "ynh_clean_check_starting": "3.5.0", @@ -165,9 +168,7 @@ official_helpers = { "ynh_write_var_in_file": "", "ynh_render_template": "", "ynh_get_debian_release": "2.7.1", - "ynh_mkdir_tmp": "", "ynh_secure_remove": "2.6.4", - "ynh_get_plain_key": "", "ynh_read_manifest": "3.5.0", "ynh_app_upstream_version": "3.5.0", "ynh_app_package_version": "3.5.0",