From d15cf538865e320e66b2c83b0aa6e22f2645b850 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Feb 2021 18:19:12 +0100 Subject: [PATCH] Fix --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 4 ++-- scripts/install | 1 - scripts/upgrade | 4 +++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c47715d..0a039a8 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc. together with your friends, fellow students or colleagues, all working on the same document at the same time. -**Shipped version:** 1.8.7 +**Shipped version:** 1.8.10 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 4780b48..e199b17 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/inst ## Résumé Etherpad vous permet d'éditer des documents de manière collaborative en temps réel, un peu comme un éditeur multi-joueurs en direct qui s'exécute dans votre navigateur. Rédigez des articles, des communiqués de presse, des listes de choses à faire, etc. avec vos amis, camarades ou collègues, tous travaillant sur le même document en même temps. -**Version embarquée :** 1.8.7 +**Version embarquée :** 1.8.10 ## Captures d'écran diff --git a/manifest.json b/manifest.json index 40b98e0..594d1ff 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,14 @@ "en": "Online editor providing collaborative editing in real-time.", "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel." }, - "version": "1.8.7~ynh1", + "version": "1.8.10~ynh1", "url": "https://etherpad.org/", "license": "Apache-2.0", "maintainer": { "name": "eric_G" }, "requirements": { - "yunohost": ">= 4.0.0" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index a504468..d62c89c 100644 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=is_public --value=$is_public ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=password --value=$password diff --git a/scripts/upgrade b/scripts/upgrade index ca41475..d3508f4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,7 +19,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) port=$(ynh_app_setting_get --app=$app --key=port) @@ -130,7 +129,10 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Reconfiguring Etherpad..." --weight=6 ynh_add_config --template="../conf/settings.json" --destination="$final_path/settings.json" +ynh_store_file_checksum --file="$final_path/settings.json" + ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json" +ynh_store_file_checksum --file="$final_path/credentials.json" #================================================= # GENERIC FINALIZATION