From 0d181969492806c3f603d9f40b5afdaecbeb457b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sun, 27 May 2018 12:01:38 +0200 Subject: [PATCH] Improve text and code style --- package_linter.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/package_linter.py b/package_linter.py index efcb2ec..878f0de 100755 --- a/package_linter.py +++ b/package_linter.py @@ -360,27 +360,23 @@ def check_arg_retrieval(script): def check_helper_usage_dependencies(script_name): """ - detects usage of ynh_package_* & apt-get * and suggest usage of - ynh_remove_app_dependencies and ynh_remove_app_dependencies + Detect usage of ynh_package_* & apt-get * + and suggest herlpers ynh_install_app_dependencies and ynh_remove_app_dependencies """ script = open(script_name).read() - present = False + if "ynh_package_install" in script or "apt-get install" in script: + print_warning("You should not use `ynh_package_install` or `apt-get install`, use `ynh_install_app_dependencies` instead") - present = "ynh_package_install" in script or "apt-get install" in script - - if present: - print_warning("You should not use ynh_package_install or apt-get install, use ynh_install_app_dependencies instead") - - present = False - present = "ynh_package_remove" in script or "apt-get remove" in script - - if present: - print_warning("You should not use ynh_package_remove or apt-get remove, use ynh_remove_app_dependencies instead") + if "ynh_package_remove" in script or "apt-get remove" in script: + print_warning("You should not use `ynh_package_remove` or `apt-get removeè, use `ynh_remove_app_dependencies` instead") def check_helper_usage_unix(script_name): """ - detects usage of sudo, rm and sed + Detect usage of unix commands with helper equivalents: + - sudo → nothing + - rm → ynh_secure_remove + - sed -i → ynh_replace_string """ script = open(script_name).read()