1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/matterbridge_ynh.git synced 2024-09-03 19:36:24 +02:00

Merge pull request #23 from YunoHost-Apps/1.24.0

1.24.0
This commit is contained in:
Éric Gaspar 2022-02-08 13:48:34 +01:00 committed by GitHub
commit 0c2e7630de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 36 deletions

View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Multi-protocols bridge for online communications Multi-protocols bridge for online communications
**Shipped version:** 1.23.2~ynh2 **Shipped version:** 1.24.0~ynh1

View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Connecteur entre une série de protocoles de discussion Connecteur entre une série de protocoles de discussion
**Version incluse :** 1.23.2~ynh2 **Version incluse :** 1.24.0~ynh1

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.23.2/matterbridge-1.23.2-linux-64bit SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.24.0/matterbridge-1.24.0-linux-64bit
SOURCE_SUM=a2604f29220de248bd51f0fb8e6458cbf64d853731fed959190ae6f351344f5f SOURCE_SUM=f0159937beb21729e87a55fc3b412ed6c2eb8a1951a381dc87aec5ec31058b37
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_IN_SUBDIR=false SOURCE_IN_SUBDIR=false
SOURCE_FILENAME=matterbridge SOURCE_FILENAME=matterbridge

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.23.2/matterbridge-1.23.2-linux-arm64 SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.24.0/matterbridge-1.24.0-linux-arm64
SOURCE_SUM=a5a93c3e62f25b1c4a9d5d59a7e28288bc733af1a3a579245b0ced9de68843ad SOURCE_SUM=e9968cac4fddc0de34b9df95b7fcdaedaecd6338cbdcb1041aa0adad6740e60c
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_IN_SUBDIR=false SOURCE_IN_SUBDIR=false
SOURCE_FILENAME=matterbridge SOURCE_FILENAME=matterbridge

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.23.2/matterbridge-1.23.2-linux-armv6 SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.24.0/matterbridge-1.24.0-linux-armv6
SOURCE_SUM=5e095e7a0a90868bc5c942af0d5f69995566d26b117ae6c75ec6ba18d100ae4d SOURCE_SUM=b127ce5980843b7656b4197724e192a110ce2157e3199b500ec82dc4e6939afd
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_IN_SUBDIR=false SOURCE_IN_SUBDIR=false
SOURCE_FILENAME=matterbridge SOURCE_FILENAME=matterbridge

View file

@ -6,7 +6,7 @@
"en": "Multi-protocols bridge for online communications", "en": "Multi-protocols bridge for online communications",
"fr": "Connecteur entre une série de protocoles de discussion" "fr": "Connecteur entre une série de protocoles de discussion"
}, },
"version": "1.23.2~ynh2", "version": "1.24.0~ynh1",
"url": "https://github.com/42wim/matterbridge", "url": "https://github.com/42wim/matterbridge",
"upstream": { "upstream": {
"license": "Apache-2.0", "license": "Apache-2.0",

View file

@ -49,11 +49,17 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" ynh_setup_source --dest_dir="$final_path" --source_id="$architecture"
chmod 750 "$final_path"
chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path"
chmod +x $final_path/$app
#================================================= #=================================================
# MODIFY A CONFIG FILE # MODIFY A CONFIG FILE
#================================================= #=================================================
ynh_script_progression --message="Adding a configuration file..." --weight=1
cp -a ../conf/matterbridge.toml $final_path/matterbridge.toml ynh_add_config --template="../conf/matterbridge.toml" --destination="$final_path/matterbridge.toml"
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD
@ -63,16 +69,6 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=1
# Create a dedicated systemd config # Create a dedicated systemd config
ynh_add_systemd_config ynh_add_systemd_config
#=================================================
# GENERIC FINALIZATION
#=================================================
# SECURE FILES AND DIRECTORIES
#=================================================
# Set permissions to app files
chmod +x $final_path/$app
chown -R $app: $final_path
#================================================= #=================================================
# INTEGRATE SERVICE IN YUNOHOST # INTEGRATE SERVICE IN YUNOHOST
#================================================= #=================================================

View file

@ -65,24 +65,29 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=2 ynh_script_progression --message="Upgrading source files..." --weight=2
# Create a temporary directory # Create a temporary directory
tmpdir="$(mktemp -d)" #tmpdir="$(mktemp -d)"
# Backup the config file in the temp dir # Backup the config file in the temp dir
cp -a "$final_path/matterbridge.toml" "$tmpdir/matterbridge.toml" #cp -a "$final_path/matterbridge.toml" "$tmpdir/matterbridge.toml"
# Remove the app directory securely # Remove the app directory securely
ynh_secure_remove --file="$final_path" #ynh_secure_remove --file="$final_path"
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" --keep="$final_path/matterbridge.toml"
# Copy the admin saved settings from tmp directory to final path # Copy the admin saved settings from tmp directory to final path
cp -a "$tmpdir/matterbridge.toml" "$final_path/matterbridge.toml" #cp -a "$tmpdir/matterbridge.toml" "$final_path/matterbridge.toml"
# Remove the tmp directory securely # Remove the tmp directory securely
ynh_secure_remove --file="$tmpdir" #ynh_secure_remove --file="$tmpdir"
fi fi
chmod 750 "$final_path"
chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path"
chmod +x $final_path/$app
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD
#================================================= #=================================================
@ -91,16 +96,6 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
# Create a dedicated systemd config # Create a dedicated systemd config
ynh_add_systemd_config ynh_add_systemd_config
#=================================================
# GENERIC FINALIZATION
#=================================================
# SECURE FILES AND DIRECTORIES
#=================================================
# Set permissions on app files
chmod +x $final_path/$app
chown -R $app: $final_path
#================================================= #=================================================
# INTEGRATE SERVICE IN YUNOHOST # INTEGRATE SERVICE IN YUNOHOST
#================================================= #=================================================