diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..152f2e7 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,8 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Lea el README en español](README_es.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 8420445..ab31745 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Chitchatter with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=chitchatter) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Chitchatter quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install Chitchatter quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview @@ -27,9 +27,9 @@ Chitchatter is a free (as in both price and freedom) communication tool. It is d - Ephemeral - Decentralized -**Shipped version:** 1.0~ynh10 +**Shipped version:** 1.0~ynh11 -**Demo:** https://chitchatter.im/ +**Demo:** ## Screenshots @@ -37,18 +37,18 @@ Chitchatter is a free (as in both price and freedom) communication tool. It is d ## Documentation and resources -* Official app website: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug or sudo yunohost app upgrade chitchatter -u https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..768d2cc --- /dev/null +++ b/README_es.md @@ -0,0 +1,57 @@ + + +# Chitchatter para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/chitchatter.svg)](https://dash.yunohost.org/appci/app/chitchatter) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/chitchatter.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/chitchatter.maintain.svg) + +[![Instalar Chitchatter con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=chitchatter) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarChitchatter rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + +Chitchatter is a free (as in both price and freedom) communication tool. It is designed with security and privacy in mind. + +### Features + +- Fully open source (licensed under GPL v2) +- Peer-to-peer +- Encrypted (via WebRTC) +- Serverless +- Ephemeral +- Decentralized + +**Versión actual:** 1.0~ynh11 + +**Demo:** + +## Capturas + +![Captura de Chitchatter](./doc/screenshots/screenshot.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug +o +sudo yunohost app upgrade chitchatter -u https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..413f82c --- /dev/null +++ b/README_eu.md @@ -0,0 +1,57 @@ + + +# Chitchatter YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/chitchatter.svg)](https://dash.yunohost.org/appci/app/chitchatter) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/chitchatter.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/chitchatter.maintain.svg) + +[![Instalatu Chitchatter YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=chitchatter) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Chitchatter YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Chitchatter is a free (as in both price and freedom) communication tool. It is designed with security and privacy in mind. + +### Features + +- Fully open source (licensed under GPL v2) +- Peer-to-peer +- Encrypted (via WebRTC) +- Serverless +- Ephemeral +- Decentralized + +**Paketatutako bertsioa:** 1.0~ynh11 + +**Demoa:** + +## Pantaila-argazkiak + +![Chitchatter(r)en pantaila-argazkia](./doc/screenshots/screenshot.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug +edo +sudo yunohost app upgrade chitchatter -u https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 0812866..5a7ae78 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Chitchatter pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer Chitchatter avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=chitchatter) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Chitchatter rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer Chitchatter rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -27,9 +27,9 @@ Chitchatter est un outil de communication gratuit (comme dans le prix et la libe - Éphémère - Décentralisé -**Version incluse :** 1.0~ynh10 +**Version incluse :** 1.0~ynh11 -**Démo :** https://chitchatter.im/ +**Démo :** ## Captures d’écran @@ -37,21 +37,21 @@ Chitchatter est un outil de communication gratuit (comme dans le prix et la libe ## Documentations et ressources -* Site officiel de l’app : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug ou sudo yunohost app upgrade chitchatter -u https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..a2a72d1 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,57 @@ + + +# Chitchatter para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/chitchatter.svg)](https://dash.yunohost.org/appci/app/chitchatter) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/chitchatter.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/chitchatter.maintain.svg) + +[![Instalar Chitchatter con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=chitchatter) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Chitchatter de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +Chitchatter is a free (as in both price and freedom) communication tool. It is designed with security and privacy in mind. + +### Features + +- Fully open source (licensed under GPL v2) +- Peer-to-peer +- Encrypted (via WebRTC) +- Serverless +- Ephemeral +- Decentralized + +**Versión proporcionada:** 1.0~ynh11 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Chitchatter](./doc/screenshots/screenshot.png) + +## Documentación e recursos + +- Web oficial da app: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug +ou +sudo yunohost app upgrade chitchatter -u https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..c6735a2 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,57 @@ + + +# YunoHost 上的 Chitchatter + +[![集成程度](https://dash.yunohost.org/integration/chitchatter.svg)](https://dash.yunohost.org/appci/app/chitchatter) ![工作状态](https://ci-apps.yunohost.org/ci/badges/chitchatter.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/chitchatter.maintain.svg) + +[![使用 YunoHost 安装 Chitchatter](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=chitchatter) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Chitchatter。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Chitchatter is a free (as in both price and freedom) communication tool. It is designed with security and privacy in mind. + +### Features + +- Fully open source (licensed under GPL v2) +- Peer-to-peer +- Encrypted (via WebRTC) +- Serverless +- Ephemeral +- Decentralized + +**分发版本：** 1.0~ynh11 + +**演示：** + +## 截图 + +![Chitchatter 的截图](./doc/screenshots/screenshot.png) + +## 文档与资源 + +- 官方应用网站： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug +或 +sudo yunohost app upgrade chitchatter -u https://github.com/YunoHost-Apps/chitchatter_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** diff --git a/manifest.toml b/manifest.toml index a17e2f7..a13a16a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,9 +5,9 @@ name = "Chitchatter" description.en = "Peer-to-peer chat that is serverless, decentralized, and ephemeral" description.fr = "Chat peer-to-peer sans serveur, décentralisée et éphémère" -version = "1.0~ynh10" +version = "1.0~ynh11" -maintainers = ["eric_G"] +maintainers = [] [upstream] license = "GPL-2.0" @@ -19,8 +19,11 @@ code = "https://github.com/jeremyckahn/chitchatter" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "2800M" ram.runtime = "50M" diff --git a/scripts/_common.sh b/scripts/_common.sh index c77d37a..b403ad5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,7 +8,7 @@ # nodejs version nodejs_version=18 -version_commit=d546fef71ce95b561017bad466ee0294987a5383 +version_commit=94a4b2fb2e2ffad7b2fb04a78257a6dac4e7095a #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 7163eeb..dfd9369 100755 --- a/scripts/install +++ b/scripts/install @@ -33,9 +33,6 @@ pushd "$install_dir" git reset --hard --quiet $version_commit popd -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" - #================================================= # NGINX CONFIGURATION #================================================= @@ -56,6 +53,9 @@ pushd $install_dir ynh_exec_warn_less $ynh_npm run build popd +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index 230370d..389ad29 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 - ynh_remove_nodejs #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c632857..0da44f7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,32 +9,19 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=5 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=5 - - pushd $install_dir - chown -R $app:www-data "$install_dir" - git config --system --add safe.directory $install_dir +pushd $install_dir + chown -R $app:www-data "$install_dir" + git config --system --add safe.directory $install_dir - ynh_exec_as $app git fetch - ynh_exec_as $app git reset --hard --quiet $version_commit - ynh_exec_as $app git pull - popd -fi - -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" + ynh_exec_as $app git fetch + ynh_exec_as $app git reset --hard --quiet $version_commit + ynh_exec_as $app git pull +popd #================================================= # UPGRADE DEPENDENCIES @@ -63,6 +50,9 @@ pushd $install_dir ynh_exec_warn_less $ynh_npm run build popd +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" + #================================================= # END OF SCRIPT #=================================================