From 5231124112355305c5592454d3aa30f21115f6e3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 25 Jun 2022 07:08:48 +0200 Subject: [PATCH] 1.25.2 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- scripts/install | 2 +- scripts/upgrade | 35 ++++++++++------------------------- 6 files changed, 18 insertions(+), 33 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 0ba10c8..1138f8d 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.24.1/matterbridge-1.24.1-linux-64bit -SOURCE_SUM=7012c04856a5f6de9cf6f17871f6fa54c915520040adcaa9fb10acafd1862c35 +SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.25.2/matterbridge-1.25.2-linux-64bit +SOURCE_SUM=146f3b5d7b045967d61be82d7135de300515daf33961f591aaf6e9d6ee4aeddf SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=matterbridge diff --git a/conf/arm64.src b/conf/arm64.src index a1b3f40..941a780 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.24.1/matterbridge-1.24.1-linux-arm64 -SOURCE_SUM=9980c7dac4b26a31b39b9f827239d6c600f9a73a652c19f2ec87bebcf21176da +SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.25.2/matterbridge-1.25.2-linux-arm64 +SOURCE_SUM=ec288472ee2b1f542586c99d2b4c37c36a77593ed1cf36470f236b1f2a6cb63c SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=matterbridge diff --git a/conf/armhf.src b/conf/armhf.src index 12c940f..561434c 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.24.1/matterbridge-1.24.1-linux-armv6 -SOURCE_SUM=96d08c3fe9031b64fae36bc30d6ed8e5fd6440afd37c78f71b8b2685f280bfa5 +SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.25.2/matterbridge-1.25.2-linux-armv6 +SOURCE_SUM=50ad94be6d98bc0a908f28de4493df5ffbe497af1a5279cdec00f0221e00a275 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=matterbridge diff --git a/manifest.json b/manifest.json index a1743dd..6658844 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Multi-protocols bridge for online communications", "fr": "Connecteur entre une série de protocoles de discussion" }, - "version": "1.24.1~ynh1", + "version": "1.25.2~ynh1", "url": "https://github.com/42wim/matterbridge", "upstream": { "license": "Apache-2.0", diff --git a/scripts/install b/scripts/install index cf8b782..148293c 100644 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,7 @@ ynh_setup_source --dest_dir="$final_path" --source_id=$YNH_ARCH chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -chmod +x $final_path/$app +chmod +x $final_path/matterbridge #================================================= # MODIFY A CONFIG FILE diff --git a/scripts/upgrade b/scripts/upgrade index 69e1494..1a55f0c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,6 +24,15 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# STANDARD UPGRADE STEPS +#================================================= +# STOP SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Stopping a systemd service..." --weight=1 + +ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log" + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -38,15 +47,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# STOP SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 - -ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log" - #================================================= # CREATE DEDICATED USER #================================================= @@ -63,29 +63,14 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=2 - # Create a temporary directory - #tmpdir="$(mktemp -d)" - - # Backup the config file in the temp dir - #cp -a "$final_path/matterbridge.toml" "$tmpdir/matterbridge.toml" - - # Remove the app directory securely - #ynh_secure_remove --file="$final_path" - # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" --source_id=$YNH_ARCH --keep="$final_path/matterbridge.toml" - - # Copy the admin saved settings from tmp directory to final path - #cp -a "$tmpdir/matterbridge.toml" "$final_path/matterbridge.toml" - - # Remove the tmp directory securely - #ynh_secure_remove --file="$tmpdir" fi chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -chmod +x $final_path/$app +chmod +x $final_path/matterbridge #================================================= # SETUP SYSTEMD