From 51c30f179eaaa9c2e9102db48df94d9c37753cf4 Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Wed, 24 Apr 2024 19:02:30 +0200 Subject: [PATCH 1/4] Tiny change --- manifest.toml | 2 +- scripts/install | 3 +-- scripts/upgrade | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5a80d89..e710bd5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Streams" description.en = "Open source fediverse server" description.fr = "Serveur fediverse open source" -version = "24.02.18~ynh2" +version = "24.02.18~ynh3" maintainers = ["Papa Dragon"] diff --git a/scripts/install b/scripts/install index 213dc46..f1b482e 100755 --- a/scripts/install +++ b/scripts/install @@ -50,10 +50,9 @@ ynh_script_progression --message="Setting up source files..." --weight=1 mkdir -p "$install_dir" chown -R $app:www-data "$install_dir" -git config --system --add safe.directory $install_dir - # Download, check integrity, uncompress and patch the source from GitHub ynh_exec_as $app git clone https://codeberg.org/streams/streams.git "$install_dir" --quiet +ynh_exec_as $app git config --system --add safe.directory $install_dir touch "$install_dir/php.log" mkdir -p "$install_dir/store" diff --git a/scripts/upgrade b/scripts/upgrade index bbf14fe..26010b1 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -82,9 +82,8 @@ then mkdir -p "$install_dir" chown -R $app:www-data "$install_dir" - git config --system --add safe.directory $install_dir - ynh_exec_as $app git clone https://codeberg.org/streams/streams.git "$install_dir" --quiet + ynh_exec_as $app git config --system --add safe.directory $install_dir ynh_app_setting_get --app=$app --key=git_branch_mode if [[ -n $git_branch_mode ]] && [ "$git_branch_mode" -eq "1" ] From 672698887e0aa3d7995216c0f7f0700b4ae115aa Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Wed, 24 Apr 2024 19:08:50 +0200 Subject: [PATCH 2/4] Revert tiny change --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index f1b482e..78fd60c 100755 --- a/scripts/install +++ b/scripts/install @@ -52,7 +52,7 @@ chown -R $app:www-data "$install_dir" # Download, check integrity, uncompress and patch the source from GitHub ynh_exec_as $app git clone https://codeberg.org/streams/streams.git "$install_dir" --quiet -ynh_exec_as $app git config --system --add safe.directory $install_dir +git config --system --add safe.directory $install_dir touch "$install_dir/php.log" mkdir -p "$install_dir/store" diff --git a/scripts/upgrade b/scripts/upgrade index 26010b1..2f11b5a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,7 +83,7 @@ then chown -R $app:www-data "$install_dir" ynh_exec_as $app git clone https://codeberg.org/streams/streams.git "$install_dir" --quiet - ynh_exec_as $app git config --system --add safe.directory $install_dir + git config --system --add safe.directory $install_dir ynh_app_setting_get --app=$app --key=git_branch_mode if [[ -n $git_branch_mode ]] && [ "$git_branch_mode" -eq "1" ] From 26e886a8a23dfe45add7ee70d390482b9e1851f8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 24 Apr 2024 18:37:39 +0000 Subject: [PATCH 3/4] Auto-update READMEs --- ALL_README.md | 7 +++++++ README.md | 15 ++++++++------- README_eu.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 25 ++++++++++++------------ README_gl.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 172 insertions(+), 19 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..a01b345 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,7 @@ +# All available README files by language + +- [Read the README in English](README.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 29446d1..c6756ac 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Streams with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=streams) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Streams 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 Streams 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 @@ -20,7 +20,8 @@ The [streams repository](https://codeberg.org/streams/streams/) lets you install Your websites will be compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzilla**, **Funkwhale**, **Peertube**, **Plume**, **WriteFreely** and many, many more. -**Shipped version:** 24.02.18~ynh2 + +**Shipped version:** 24.02.18~ynh3 ## Screenshots @@ -34,9 +35,9 @@ Your websites will be compatible with **Mastodon**, **Pleroma**, **Pixelfed**, * ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/streams_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/streams_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: ```bash sudo yunohost app install https://github.com/YunoHost-Apps/streams_ynh/tree/testing --debug diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..4770287 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,48 @@ + + +# Streams YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/streams.svg)](https://dash.yunohost.org/appci/app/streams) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/streams.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/streams.maintain.svg) + +[![Instalatu Streams YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=streams) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Streams YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +The [streams repository](https://codeberg.org/streams/streams/) lets you install fediverse-connected websites with powerful and innovative features such as decentralized/nomadic identity, permissions framework, and much more (see [FEATURES](doc/FEATURES.md)). + +Your websites will be compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzilla**, **Funkwhale**, **Peertube**, **Plume**, **WriteFreely** and many, many more. + + +**Paketatutako bertsioa:** 24.02.18~ynh3 + +## Pantaila-argazkiak + +![Streams(r)en pantaila-argazkia](./doc/screenshots/example.png) + +## Dokumentazioa eta baliabideak + +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/streams_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/streams_ynh/tree/testing --debug +edo +sudo yunohost app upgrade streams -u https://github.com/YunoHost-Apps/streams_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 3d1f134..6aac054 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Streams pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer Streams avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=streams) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Streams 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 Streams 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 @@ -20,7 +20,8 @@ Le [dépôt streams](https://codeberg.org/streams/streams/) vous permet d'instal Vos sites web seront compatibles avec **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzilla**, **Funkwhale**, **Peertube**, **Plume**, **WriteFreely** et bien d'autres encore. -**Version incluse :** 24.02.18~ynh2 + +**Version incluse :** 24.02.18~ynh3 ## Captures d’écran @@ -28,15 +29,15 @@ Vos sites web seront compatibles avec **Mastodon**, **Pleroma**, **Pixelfed**, * ## Documentations et ressources -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : +- 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/streams_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/streams_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : ```bash sudo yunohost app install https://github.com/YunoHost-Apps/streams_ynh/tree/testing --debug @@ -44,4 +45,4 @@ ou sudo yunohost app upgrade streams -u https://github.com/YunoHost-Apps/streams_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..d06d205 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,48 @@ + + +# Streams para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/streams.svg)](https://dash.yunohost.org/appci/app/streams) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/streams.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/streams.maintain.svg) + +[![Instalar Streams con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=streams) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Streams 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 + +The [streams repository](https://codeberg.org/streams/streams/) lets you install fediverse-connected websites with powerful and innovative features such as decentralized/nomadic identity, permissions framework, and much more (see [FEATURES](doc/FEATURES.md)). + +Your websites will be compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzilla**, **Funkwhale**, **Peertube**, **Plume**, **WriteFreely** and many, many more. + + +**Versión proporcionada:** 24.02.18~ynh3 + +## Capturas de pantalla + +![Captura de pantalla de Streams](./doc/screenshots/example.png) + +## Documentación e recursos + +- 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/streams_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/streams_ynh/tree/testing --debug +ou +sudo yunohost app upgrade streams -u https://github.com/YunoHost-Apps/streams_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..568760f --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,48 @@ + + +# YunoHost 的 Streams + +[![集成程度](https://dash.yunohost.org/integration/streams.svg)](https://dash.yunohost.org/appci/app/streams) ![工作状态](https://ci-apps.yunohost.org/ci/badges/streams.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/streams.maintain.svg) + +[![使用 YunoHost 安装 Streams](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=streams) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Streams。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +The [streams repository](https://codeberg.org/streams/streams/) lets you install fediverse-connected websites with powerful and innovative features such as decentralized/nomadic identity, permissions framework, and much more (see [FEATURES](doc/FEATURES.md)). + +Your websites will be compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzilla**, **Funkwhale**, **Peertube**, **Plume**, **WriteFreely** and many, many more. + + +**分发版本：** 24.02.18~ynh3 + +## 截图 + +![Streams 的截图](./doc/screenshots/example.png) + +## 文档与资源 + +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/streams_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/streams_ynh/tree/testing --debug +或 +sudo yunohost app upgrade streams -u https://github.com/YunoHost-Apps/streams_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 55bf5498470654d018fe142dabfdbc8c192323c6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 24 Apr 2024 18:58:07 +0000 Subject: [PATCH 4/4] Auto-update READMEs --- ALL_README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/ALL_README.md b/ALL_README.md index 9f00473..a01b345 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -4,5 +4,4 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) -- [Leggi il “README” in italiano](README_it.md) - [阅读中文（简体）的 README](README_zh_Hans.md)