From f2436faab30347a2b37b1e9524c1973e676859ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:10:10 +0200 Subject: [PATCH] fix --- scripts/install | 8 ++------ scripts/upgrade | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 158f143..2a8abcc 100755 --- a/scripts/install +++ b/scripts/install @@ -25,12 +25,8 @@ fi #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1 +ynh_script_progression --message="Storing installation settings..." --weight=1 -ynh_app_setting_set --app=$app --key=name --value=$name -ynh_app_setting_set --app=$app --key=registration --value=$registration -ynh_app_setting_set --app=$app --key=cache --value=$cache -ynh_app_setting_set --app=$app --key=size --value=$size ynh_app_setting_set --app=$app --key=admin_email --value=$admin_email ynh_app_setting_set --app=$app --key=random_key --value=$random_key ynh_app_setting_set --app=$app --key=signing_salt --value=$signing_salt @@ -51,7 +47,7 @@ ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";" - ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir/live" --source_id=$YNH_ARCH +ynh_setup_source --dest_dir="$install_dir/live" chmod -R o-rwx "$install_dir" chown -R $app:$app "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index b965dd7..e63472d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,12 +18,13 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # CHECK VERSION NUMBER #================================================= -ynh_script_progression --message="Checking version number..." --weight=1 if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then sleep 60 fi + abort_if_up_to_date + # previous function is what defines 'version', more precisely the 'previous version' previous_version="${version}"