From 41d8a1532a995773bcacdbe2171e63797bef305a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Aug 2023 12:17:23 +0200 Subject: [PATCH 1/8] Update manifest.toml --- manifest.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index a3ba62b..5d5c01b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ demo = "https://ethercalc.net/" code = "https://github.com/audreyt/ethercalc" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false @@ -28,7 +28,6 @@ ram.runtime = "50M" [install] [install.domain] type = "domain" - full_domain = true [install.init_main_permission] type = "group" From c2becaa5021afbcea424a9f0278500e7d34f0cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 1 Dec 2023 18:24:49 +0100 Subject: [PATCH 2/8] Update manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index 5d5c01b..fc5e0d3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,8 +19,11 @@ code = "https://github.com/audreyt/ethercalc" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" From a9d08610a84f827346bcdb2a71494183b27b067e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 1 Jan 2024 23:13:52 +0100 Subject: [PATCH 3/8] Update install --- scripts/install | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index c2acfad..66eb2dc 100644 --- a/scripts/install +++ b/scripts/install @@ -49,8 +49,11 @@ ynh_script_progression --message="Building EtherCalc... (this will take some tim pushd "$install_dir" ynh_use_nodejs - ynh_exec_warn_less npm i -g ethercalc - ynh_exec_warn_less npm i zappajs + ynh_secure_remove --file="$install_dir/package-lock.json" + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install -g ethercalc + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install zappajs + #ynh_exec_warn_less npm i -g ethercalc + #ynh_exec_warn_less npm i zappajs popd #================================================= From 2934f01f0d6ba4d8f3eddfdf06fd8af9dc809d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 1 Jan 2024 23:17:38 +0100 Subject: [PATCH 4/8] Update install --- scripts/install | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 66eb2dc..d572541 100644 --- a/scripts/install +++ b/scripts/install @@ -14,7 +14,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Installing dependencies..." --weight=20 -# Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= @@ -22,7 +21,6 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= ynh_script_progression --message="Setting up source files..." --weight=2 -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$install_dir chmod -R o-rwx "$install_dir" @@ -34,7 +32,6 @@ chmod +x $install_dir/bin/runSafe.sh #================================================= ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 -# Create a dedicated NGINX config ynh_add_nginx_config env_path="$PATH" @@ -50,10 +47,10 @@ ynh_script_progression --message="Building EtherCalc... (this will take some tim pushd "$install_dir" ynh_use_nodejs ynh_secure_remove --file="$install_dir/package-lock.json" - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install -g ethercalc - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install zappajs - #ynh_exec_warn_less npm i -g ethercalc - #ynh_exec_warn_less npm i zappajs + #ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install -g ethercalc + #ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install zappajs + ynh_exec_warn_less npm i -g ethercalc + ynh_exec_warn_less npm i zappajs popd #================================================= From 511309fb862eede6349a72762375b9161c9d4350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 1 Jan 2024 23:22:05 +0100 Subject: [PATCH 5/8] cleaning --- manifest.toml | 2 +- scripts/install | 2 -- scripts/remove | 4 ---- scripts/restore | 1 - scripts/upgrade | 2 -- 5 files changed, 1 insertion(+), 10 deletions(-) diff --git a/manifest.toml b/manifest.toml index fc5e0d3..5a88650 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "EtherCalc" description.en = "Real-time collaborative spreadsheet editor" description.fr = "Feuille de calcul collaborative en ligne" -version = "20201228~ynh9" +version = "20240101~ynh1" maintainers = ["ljf"] diff --git a/scripts/install b/scripts/install index d572541..55e99f0 100644 --- a/scripts/install +++ b/scripts/install @@ -47,8 +47,6 @@ ynh_script_progression --message="Building EtherCalc... (this will take some tim pushd "$install_dir" ynh_use_nodejs ynh_secure_remove --file="$install_dir/package-lock.json" - #ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install -g ethercalc - #ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install zappajs ynh_exec_warn_less npm i -g ethercalc ynh_exec_warn_less npm i zappajs popd diff --git a/scripts/remove b/scripts/remove index ee3f6f6..25e1853 100644 --- a/scripts/remove +++ b/scripts/remove @@ -16,20 +16,16 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 -# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then ynh_script_progression --message="Removing $app service integration..." --weight=2 yunohost service remove $app fi -# Remove the dedicated systemd config ynh_remove_systemd_config -# Remove metapackage and its dependencies ynh_remove_nodejs -# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= diff --git a/scripts/restore b/scripts/restore index 2208cab..0b031df 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,7 +27,6 @@ chmod +x $install_dir/bin/runSafe.sh #================================================= ynh_script_progression --message="Reinstalling dependencies..." --weight=1 -# Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index fe29ad4..c7557c5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,10 +47,8 @@ chmod +x $install_dir/bin/runSafe.sh #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=1 -# Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -# Create a dedicated nginx config ynh_add_nginx_config env_path="$PATH" From 766b624f02bd31ee8a5b5c3e946e668deca565de Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 1 Jan 2024 22:22:13 +0000 Subject: [PATCH 6/8] 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 850b01b..98f171a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,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~ynh9 +**Shipped version:** 20240101~ynh1 **Demo:** https://ethercalc.net/ diff --git a/README_fr.md b/README_fr.md index ba51a6b..b728306 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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~ynh9 +**Version incluse :** 20240101~ynh1 **Démo :** https://ethercalc.net/ From 80577332e4de81bceb4818109647b8fee3cdfde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 1 Jan 2024 23:22:27 +0100 Subject: [PATCH 7/8] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index c7557c5..cf93efb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -64,6 +64,7 @@ ynh_script_progression --message="Building EtherCalc... (this will take some tim pushd "$install_dir" ynh_use_nodejs + ynh_secure_remove --file="$install_dir/package-lock.json" ynh_exec_warn_less npm install -g ethercalc ynh_exec_warn_less npm i zappajs popd From 2809f3e1ea070c8500d95fa71a416a2025830460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 1 Jan 2024 23:23:51 +0100 Subject: [PATCH 8/8] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 5a88650..12b42f1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -25,7 +25,7 @@ ldap = false sso = false disk = "50M" -ram.build = "50M" +ram.build = "500M" ram.runtime = "50M" [install]