From cbbce1adb8f847b527a9720b973be8c871e859ac Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Sun, 27 May 2018 17:19:49 +0200 Subject: [PATCH 1/4] [fix] Linter manifest (#10) --- manifest.json | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index de8175a..24cc835 100644 --- a/manifest.json +++ b/manifest.json @@ -1,16 +1,27 @@ { "name": "EtherCalc", "id": "ethercalc", + "packaging_format": 1, + "version": "0.20170704.0~ynh1", "description": { "en": "Online web spreadsheet editor providing collaborative editing in really real-time", "fr": "Feuille de calcul collaborative en ligne" }, - "developer": { - "name": "zamentur", - "email": "valentin@grimaud.me", - "url": "https://ethercalc.net/" + "license": "CPAL-1.0&Artistic-2.0", + "maintainer": { + "name": "ljf", + "email": "ljf+ethercalc_ynh@reflexlibre.net", + "url": "https://reflexlibre.net" }, - "multi_instance": "false", + "multi_instance": false, + "url": "https://https://ethercalc.net/", + "requirements": { + "yunohost": ">= 2.7.2" + }, + "services": [ + "nginx", + "redis-server" + ], "arguments": { "install" : [ { From e8a1d9f938e04f2228639d2f2cb6c29aa8300457 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Sat, 20 Jul 2019 20:33:05 +0200 Subject: [PATCH 2/4] Use an `example_ynh` README --- README.md | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 77 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index daa3056..a74a09b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,80 @@ -ethercalc_ynh -=============== -[![Install Ethercalc with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=ethercalc) +# EtherCalc for YunoHost -ETAT = INPROGRESS -EtherCalc for YunoHost +[![Integration level](https://dash.yunohost.org/integration/ethercalc_.svg)](https://dash.yunohost.org/appci/app/ethercalc) +[![Install EtherCalc with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=ethercalc) -EtherCalc is an online web spreadsheet. +> *This package allow you to install EtherCalc quickly and simply on a YunoHost server. -https://ethercalc.net/ +If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* + +## Status + +Work. In. Progress. + +## Overview + +EtherCalc is a web spreadsheet. + +Your data is saved on the web, and people can edit the same document at the same time. Everybody's changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions and more! + +**Shipped version:** [0.20170704.0](https://github.com/audreyt/ethercalc/tree/0.20170704.0) + +## Screenshots + +![](https://ethercalc.org/static/img/davy/gfx/screenshot.png) + +## Demo + +* [Official demo](https://ethercalc.org/_new) + +## Configuration + +N/A. + +## Documentation + + * [Official EtherCalc documentation](https://ethercalc.net/#ch1) + +## YunoHost specific features + +#### Multi-users support + +* TODO + +#### Supported architectures + +* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ethercalc%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/ethercalc/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/ethercalc%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/ethercalc/) +* Stretch x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/ethercalc%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/ethercalc/) + +## Limitations + +* TODO + +## Additional information + +N/A. + +## Links + + * Report a bug: https://github.com/YunoHost-Apps/ethercalc_ynh/issues + * App website: https://ethercalc.net/ + * Upstream app repository: https://github.com/audreyt/ethercalc + * YunoHost website: https://yunohost.org/ + +--- + +Developers info +--------------- + +**Only if you want to use a testing branch for coding, instead of merging directly into master.** + +Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/ethercalc_ynh/tree/testing). + +To try the testing branch, please proceed like that. + +``` +$ sudo yunohost app install https://github.com/YunoHost-Apps/ethercalc_ynh/tree/testing --debug +$ # or ... +$ sudo yunohost app upgrade ethercalc -u https://github.com/YunoHost-Apps/ethercalc_ynh/tree/testing --debug +``` From 26bbb6aa64339d12f84a250e9b73354f1419e64f Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Sat, 20 Jul 2019 20:33:14 +0200 Subject: [PATCH 3/4] Fix URL and select multi instance --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 24cc835..58fb394 100644 --- a/manifest.json +++ b/manifest.json @@ -13,8 +13,8 @@ "email": "ljf+ethercalc_ynh@reflexlibre.net", "url": "https://reflexlibre.net" }, - "multi_instance": false, - "url": "https://https://ethercalc.net/", + "multi_instance": true, + "url": "https://ethercalc.net/", "requirements": { "yunohost": ">= 2.7.2" }, From 25c0cd27df5af333ead90789968dfc83f5bc5c62 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Sun, 21 Jul 2019 17:48:18 +0200 Subject: [PATCH 4/4] Hard-code root path for now --- scripts/install | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index e166ca5..2521d5e 100644 --- a/scripts/install +++ b/scripts/install @@ -22,7 +22,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN is_public=$YNH_APP_ARG_IS_PUBLIC -path_url="" # Assure la compatibilité avec les fonctions utilisant $path_url +path_url="/" expire=YNH_APP_ARG_EXPIRE # This is a multi-instance app, meaning it can be installed several times independently @@ -41,9 +41,6 @@ app=$YNH_APP_INSTANCE_NAME # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -# Normalize the url path syntax -path_url=$(ynh_normalize_url_path $domain) - # Check web path availability ynh_webpath_available $domain $path_url # Register (book) web path