From e73e1d6fd39f44f733db3926c97681a2c210816f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Sep 2021 09:06:34 +0200 Subject: [PATCH 1/3] Cleaning up --- conf/systemd.service | 2 +- manifest.json | 5 ++--- scripts/_common.sh | 2 -- scripts/install | 2 -- scripts/remove | 1 - scripts/restore | 3 --- scripts/upgrade | 2 -- 7 files changed, 3 insertions(+), 14 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 4361b48..0f4b534 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Ethercalc, the collaborative spreadsheet editor. +Description=Ethercalc: collaborative spreadsheet editor. After=network.target [Service] diff --git a/manifest.json b/manifest.json index faade0b..0f8b6bc 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "ethercalc", "packaging_format": 1, "description": { - "en": "Online web spreadsheet editor providing collaborative editing in really real-time", + "en": "Real-time collaborative spreadsheet editor", "fr": "Feuille de calcul collaborative en ligne" }, "version": "20201228~ynh3", @@ -31,8 +31,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "is_public", diff --git a/scripts/_common.sh b/scripts/_common.sh index d493113..7912aa4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,6 @@ # COMMON VARIABLES #================================================= -pkg_dependencies="redis-server redis-tools" - nodejs_version=14 #================================================= diff --git a/scripts/install b/scripts/install index 155a5a4..e21720b 100644 --- a/scripts/install +++ b/scripts/install @@ -64,8 +64,6 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= ynh_script_progression --message="Installing dependencies..." --weight=20 -ynh_install_app_dependencies $pkg_dependencies - # Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version diff --git a/scripts/remove b/scripts/remove index f5b41ab..b9dc01b 100644 --- a/scripts/remove +++ b/scripts/remove @@ -46,7 +46,6 @@ ynh_remove_systemd_config ynh_script_progression --message="Removing dependencies..." --weight=2 # Remove metapackage and its dependencies -ynh_remove_app_dependencies ynh_remove_nodejs #================================================= diff --git a/scripts/restore b/scripts/restore index 97853e5..63e6ce5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -76,9 +76,6 @@ chmod +x $final_path/bin/runSafe.sh #================================================= ynh_script_progression --message="Reinstalling dependencies..." --weight=1 -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies - # Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version diff --git a/scripts/upgrade b/scripts/upgrade index fc4e75e..94a3fa6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -106,8 +106,6 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=6 -ynh_install_app_dependencies $pkg_dependencies - # Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version From 80c46a64691965a2c477f16342867d64baf60c18 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 26 Sep 2021 19:52:45 +0200 Subject: [PATCH 2/3] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0f8b6bc..ff01d61 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Real-time collaborative spreadsheet editor", "fr": "Feuille de calcul collaborative en ligne" }, - "version": "20201228~ynh3", + "version": "20201228~ynh4", "url": "https://ethercalc.net/", "upstream": { "license": "CPAL-1.0", From 7b4597a0552b054e22ba6c5b2bf17c8a597a7c09 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 26 Sep 2021 17:52:52 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 63e1920..017cd70 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in EtherCalc is a collaborative spreadsheet that can be edited in real time. Each spreadsheet has its own URL. It has the basic functionalities: formatting, mathematical functions, graphics, adding comments, version history, export in HTML or in CSV. EtherCalc is a decentralized software: different instances allow the use of the service, they are made available by several organizations (for example the eponymous site or the FramaCalc service). This makes it possible to avoid concentrating all the data in the hands of the same actor. Instances can be personalized (limitation of the duration of hosting of the spreadsheet, modification of the design, etc.). -**Shipped version:** 20201228~ynh3 +**Shipped version:** 20201228~ynh4 **Demo:** https://ethercalc.net/ diff --git a/README_fr.md b/README_fr.md index 9807594..de74eed 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour EtherCalc est un tableur collaboratif éditable en temps réel. Chaque tableur possède sa propre URL. Il dispose des fonctionnalités de base : mise en forme, fonctions mathématiques, graphiques, ajout de commentaires, historique des versions, export en HTML ou en CSV. EtherCalc est un logiciel décentralisé : différentes instances permettent d'utiliser le service, elles sont mises à disposition par plusieurs organisations (par exemple le site éponyme ou le service FramaCalc). Cela permet d'éviter de concentrer toutes les données entre les mains d'un même acteur. Les instances peuvent être personnalisées (limitation de la durée d'hébergement du tableur, modification du design, etc.). -**Version incluse :** 20201228~ynh3 +**Version incluse :** 20201228~ynh4 **Démo :** https://ethercalc.net/