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

Hot fix (#57) (#58)

* Remove -- deployment that make upgrade to fail
* Stop before removing the systemd service
This commit is contained in:
Éric Gaspar 2021-01-03 17:42:35 +01:00 committed by GitHub
parent 98e75b940a
commit fdd62ad17e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 16 deletions

View file

@ -21,7 +21,7 @@
setup_private=1 setup_private=1
setup_public=1 setup_public=1
upgrade=1 upgrade=1
upgrade=1 from_commit=4c29aa94f9d9048411c6e165e122e03574fb9b8d upgrade=1 from_commit=ec8858ed0d054049a0c8f46c6126ee8ae0798e8f
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=0
port_already_use=1 (8095) port_already_use=1 (8095)
@ -32,6 +32,6 @@
Email= Email=
Notification=change Notification=change
;;; Upgrade options ;;; Upgrade options
; commit=4c29aa94f9d9048411c6e165e122e03574fb9b8d ; commit=ec8858ed0d054049a0c8f46c6126ee8ae0798e8f
name=08 Sep 2017 4c29aa94f9d9048411c6e165e122e03574fb9b8d name=22 May 2020 ec8858ed0d054049a0c8f46c6126ee8ae0798e8f
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&always_encrypt=1& manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&always_encrypt=1&

View file

@ -6,9 +6,9 @@
"en": "Self hosting images and sharing anonymous application", "en": "Self hosting images and sharing anonymous application",
"fr": "Application d'hébergement et de partage d'images anonyme" "fr": "Application d'hébergement et de partage d'images anonyme"
}, },
"version": "0.12.1~ynh1", "version": "0.12.1~ynh2",
"url": "https://lut.im", "url": "https://lut.im",
"license": "AGPL-3.0", "license": "AGPL-3.0-only",
"maintainer": { "maintainer": {
"name": "None...", "name": "None...",
"email": "" "email": ""

View file

@ -21,14 +21,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
#================================================= #=================================================
# STANDARD REMOVE # STANDARD REMOVE
#=================================================
# STOP AND REMOVE SERVICE
#=================================================
ynh_script_progression --message="Stopping and removing the systemd service..." --weight=6
# Remove the dedicated systemd config
ynh_remove_systemd_config
#================================================= #=================================================
# REMOVE SERVICE FROM ADMIN PANEL # REMOVE SERVICE FROM ADMIN PANEL
#================================================= #=================================================
@ -40,6 +32,14 @@ then
yunohost service remove $app yunohost service remove $app
fi fi
#=================================================
# STOP AND REMOVE SERVICE
#=================================================
ynh_script_progression --message="Stopping and removing the systemd service..." --weight=6
# Remove the dedicated systemd config
ynh_remove_systemd_config
#================================================= #=================================================
# REMOVE DEPENDENCIES # REMOVE DEPENDENCIES
#================================================= #=================================================

View file

@ -266,9 +266,10 @@ ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_fil
if [ "$upgrade_type" == "UPGRADE_APP" ] if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_script_progression --message="Upgrading $app with Carton..." --weight=4 ynh_script_progression --message="Upgrading $app with Carton..." --weight=4
(cd $final_path pushd "$final_path"
ynh_secure_remove --file="$final_path/local" ynh_secure_remove --file="$final_path/local"
carton install --deployment --without=mysql --without=htpasswd --without=test) carton install --without=mysql --without=htpasswd --without=test
popd
fi fi
#================================================= #=================================================