diff --git a/manifest.toml b/manifest.toml index 59d4bba..3131115 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Mattermost" description.en = "Open source collaboration platform built for developers" description.fr = "Plateforme de collaboration open source conçue pour les développeurs" -version = "9.5.1~ynh1" +version = "9.5.2~ynh1" maintainers = ["pmorinerie"] @@ -76,18 +76,18 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - amd64.url = "https://releases.mattermost.com/9.5.1/mattermost-team-9.5.1-linux-amd64.tar.gz" - amd64.sha256 = "17e73b98a6b874b90a4da7ac5b7cead9d0892ec82d066f692c2aefb639cf658e" - arm64.url = "https://releases.mattermost.com/9.5.1/mattermost-team-9.5.1-linux-arm64.tar.gz" - arm64.sha256 = "85c5dd41000146b5c02a5877e3cd2174dd859f131474f24ad618e0f082b6f351" + amd64.url = "https://releases.mattermost.com/9.5.2/mattermost-team-9.5.2-linux-amd64.tar.gz" + amd64.sha256 = "bfa870bb2c592671878af7e320f95d8a93f0df10377d7c70651390a0fabbbd7a" + arm64.url = "https://releases.mattermost.com/9.5.2/mattermost-team-9.5.2-linux-arm64.tar.gz" + arm64.sha256 = "dd5f206d39b3d3249f7f9736f45825d9d91fd1c368b5323e4885157196b98861" armhf.url = "https://github.com/remiheens/mattermost-docker-arm/releases/download/v9.5.1/mattermost-v9.5.1-linux-arm.tar.gz" armhf.sha256 = "1b235b3bb2511df5e8f43320d9b78b2263056873f4cab0d425ab82c40c390b12" [resources.sources.enterprise] - amd64.url = "https://releases.mattermost.com/9.5.1/mattermost-enterprise-9.5.1-linux-amd64.tar.gz" - amd64.sha256 = "177d8d5ae94a521a321cf0a60828a1e876fdf96da2b85fccc72f544ab829d693" - arm64.url = "https://releases.mattermost.com/9.5.1/mattermost-enterprise-9.5.1-linux-arm64.tar.gz" - arm64.sha256 = "685a0fb6a2111cd27f1d77e37c0586aafeb592106fc21ae9dab346f34bea5f56" + amd64.url = "https://releases.mattermost.com/9.5.2/mattermost-enterprise-9.5.2-linux-amd64.tar.gz" + amd64.sha256 = "a208a8c1b3581e8f4d4d02c083538a5e9f29575667ee43dc651f6e91a2afa4a0" + arm64.url = "https://releases.mattermost.com/9.5.2/mattermost-enterprise-9.5.2-linux-arm64.tar.gz" + arm64.sha256 = "99a09048434cb75f6d304329924ee9fda6bdfe11aa293777a08f528d7fbba12f" [resources.system_user] allow_email = true diff --git a/scripts/upgrade b/scripts/upgrade index 8285423..bb135c3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -56,35 +50,31 @@ ynh_systemd_action --service_name=$app --action=stop --log_path=systemd #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=2 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=2 +# Create a temporary directory +tmpdir="$(mktemp -d)" - # Create a temporary directory - tmpdir="$(mktemp -d)" +# Backup the config file and local plugins in the temp dir +cp -a "$install_dir/config/config.json" "$tmpdir/config.json" +cp -ar "$install_dir/plugins" "$tmpdir/plugins" - # Backup the config file and local plugins in the temp dir - cp -a "$install_dir/config/config.json" "$tmpdir/config.json" - cp -ar "$install_dir/plugins" "$tmpdir/plugins" +# Remove the app directory securely +ynh_secure_remove --file="$install_dir" - # Remove the app directory securely - ynh_secure_remove --file="$install_dir" - - if [ "$version" = "Enterprise" ]; then - ynh_setup_source --dest_dir="$install_dir" --source_id="enterprise" - elif [ "$version" = "Team" ]; then - ynh_setup_source --dest_dir="$install_dir" --source_id="main" - fi - - # Copy the admin saved settings and plugins from tmp directory to final path - cp -a "$tmpdir/config.json" "$install_dir/config/config.json" - cp -ar --no-clobber "$tmpdir/plugins" "$install_dir/" - - # Remove the tmp directory securely - ynh_secure_remove --file="$tmpdir" +if [ "$version" = "Enterprise" ]; then + ynh_setup_source --dest_dir="$install_dir" --source_id="enterprise" +elif [ "$version" = "Team" ]; then + ynh_setup_source --dest_dir="$install_dir" --source_id="main" fi +# Copy the admin saved settings and plugins from tmp directory to final path +cp -a "$tmpdir/config.json" "$install_dir/config/config.json" +cp -ar --no-clobber "$tmpdir/plugins" "$install_dir/" + +# Remove the tmp directory securely +ynh_secure_remove --file="$tmpdir" + chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"