denis/chibisafe_ynh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework upgrade, remove the 'if upgrade_type == UPGRADE_APP' test.

Browse source 
Indeed, even if the upgrade is only a 'ynh revision', this revision might actually be fixing
what *is* inside this if test.
So we can't discriminate generic things in the script according to the upgrade_type.

The ynh_check_app_version_changed helper is now a simple shim that reads YNH_APP_UPGRADE_TYPE.
The rest of its old logic is now handled by the core.
So instead of calling it, we can just read YNH_APP_UPGRADE_TYPE and add some documentation about
possible values.
This commit is contained in:
Félix Piédallu 2024-01-11 01:10:40 +01:00
parent bbbc1df6dd
commit 9dd25c37a0
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/upgrade
View file

@ -22,13 +22,12 @@ source /usr/share/yunohost/helpers
### - resources are automatically provisioned / updated / deleted (depending on existing resources) ### - resources are automatically provisioned / updated / deleted (depending on existing resources)
### - a safety backup is automatically created by the core and will be restored if the upgrade fails ### - a safety backup is automatically created by the core and will be restored if the upgrade fails
### This helper will compare the version of the currently installed app and the version of the upstream package. ### This variable describes which upgrade type is occurring, allowing the script to handle different modes:
### $upgrade_type can have 2 different values
### - UPGRADE_APP if the upstream app version has changed
### - UPGRADE_PACKAGE if only the YunoHost package has changed ### - UPGRADE_PACKAGE if only the YunoHost package has changed
### ynh_check_app_version_changed will stop the upgrade if the app is up to date. ### - UPGRADE_APP if the upstream app version has changed
### UPGRADE_APP should be used to upgrade the core app only if there's an upgrade to do. ### If your package needs to handle other things, like same-version upgrades or downgrades, please
upgrade_type=$(ynh_check_app_version_changed) ### check out the $YNH_APP_UPGRADE_TYPE variable that can contain DOWNGRADE and UPGRADE_SAME too.
# upgrade_type=$(ynh_check_app_version_changed)
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
@ -66,12 +65,10 @@ ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$a
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
#================================================= #=================================================
if [ "$upgrade_type" == "UPGRADE_APP" ]; then ynh_script_progression --message="Upgrading source files..." --weight=1
ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from manifest.toml # Download, check integrity, uncompress and patch the source from manifest.toml
ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir"
fi
### $install_dir will automatically be initialized with some decent ### $install_dir will automatically be initialized with some decent
### permissions by default ... however, you may need to recursively reapply ### permissions by default ... however, you may need to recursively reapply