From 27ce98e2d6a0878d73eff75975d49dbe555bd2bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Apr 2023 12:10:37 +0200 Subject: [PATCH] cleaning --- scripts/install | 6 ++++-- scripts/restore | 1 - scripts/upgrade | 1 - tests.toml | 8 ++++++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 3f60ac3..eec4f89 100644 --- a/scripts/install +++ b/scripts/install @@ -9,6 +9,10 @@ source _common.sh source /usr/share/yunohost/helpers +#================================================= +# RETRIEVE ARGUMENTS FROM THE MANIFEST +#================================================= + timezone="$(cat /etc/timezone)" redis_db=$(ynh_redis_get_free_db) email=$(ynh_user_get_info --username=$admin --key=mail) @@ -21,7 +25,6 @@ fpm_usage="low" #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=redis_db --value=$redis_db ynh_app_setting_set --app=$app --key=auth_method --value=$auth_method @@ -37,7 +40,6 @@ ynh_script_progression --message="Setting up source files..." --weight=7 ynh_setup_source --dest_dir="$install_dir" # Set permissions to app files -chmod 750 $install_dir chmod -R o-rwx $install_dir chown -R $app:www-data $install_dir diff --git a/scripts/restore b/scripts/restore index dca5514..8a6cbfc 100644 --- a/scripts/restore +++ b/scripts/restore @@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" # Restore permissions on app files -chmod 750 $install_dir chmod -R o-rwx $install_dir chown -R $app:www-data $install_dir chmod 600 $install_dir/.env diff --git a/scripts/upgrade b/scripts/upgrade index ba5e152..397512a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -56,7 +56,6 @@ then ynh_setup_source --dest_dir="$install_dir" --keep=".env public/uploads storage/uploads" fi -chmod 755 $install_dir chmod -R o-rwx $install_dir chown -R $app:www-data $install_dir diff --git a/tests.toml b/tests.toml index 44893f2..205d217 100644 --- a/tests.toml +++ b/tests.toml @@ -2,6 +2,14 @@ test_format = 1.0 [default] + # ------------------------------- + # Default args to use for install + # ------------------------------- + exclude = ["install.nourl"] + # ------------------------------- + # Commits to test upgrade from + # ------------------------------- + test_upgrade_from.d653976.name = "Upgrade from 23.01"