Merge pull request #31 from YunoHost-Apps/testing

Testing
2024-09-03 18:36:10 +02:00 · 2024-04-11 14:12:11 +02:00 · 2024-04-11 14:12:11 +02:00 · aa81ec33ab
commit aa81ec33ab
parent 554362150e 599b0b6bda
13 changed files with 128 additions and 14 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -1,6 +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)
- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ It shall NOT be edited by hand.

 [![Install Etherpad with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad)

-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*

 > *This package allows you to install Etherpad 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.*
@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",


-**Shipped version:** 1.9.7~ynh1
+**Shipped version:** 2.0.2~ynh1

 **Demo:** <https://video.etherpad.com/>

--- a/README_eu.md
+++ b/README_eu.md
@ -0,0 +1,53 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Etherpad YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)
+
+[![Instalatu Etherpad YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Etherpad YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control.
+This version of Etherpad is installed without plugins and uses Redis as database.
+Be aware, Redis database backup and restore is not fully implemented.
+If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
+
+
+**Paketatutako bertsioa:** 2.0.2~ynh1
+
+**Demoa:** <https://video.etherpad.com/>
+
+## Pantaila-argazkiak
+
+![Etherpad(r)en pantaila-argazkia](./doc/screenshots/screenshot.png)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://etherpad.org/>
+- Administratzaileen dokumentazio ofiziala: <http://etherpad.org/doc/v1.9.3>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/ether/etherpad-lite>
+- YunoHost Denda: <https://apps.yunohost.org/app/etherpad>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade etherpad -u https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -22,7 +22,7 @@ Attention, la sauvegarde et la restauration de la base de données Redis ne sont
 Si vous souhaitez installer Etherpad avec les plugins et la base de données mysql : https://github.com/YunoHost-Apps/etherpad_mypads_ynh",


-**Version incluse :** 1.9.7~ynh1
+**Version incluse :** 2.0.2~ynh1

 **Démo :** <https://video.etherpad.com/>

--- a/README_gl.md
+++ b/README_gl.md
@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",


-**Versión proporcionada:** 1.9.7~ynh1
+**Versión proporcionada:** 2.0.2~ynh1

 **Demo:** <https://video.etherpad.com/>

--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -0,0 +1,53 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 的 Etherpad
+
+[![集成程度](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![工作状态](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)
+
+[![使用 YunoHost 安装 Etherpad](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Etherpad。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control.
+This version of Etherpad is installed without plugins and uses Redis as database.
+Be aware, Redis database backup and restore is not fully implemented.
+If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
+
+
+**分发版本：** 2.0.2~ynh1
+
+**演示：** <https://video.etherpad.com/>
+
+## 截图
+
+![Etherpad 的截图](./doc/screenshots/screenshot.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://etherpad.org/>
+- 官方管理文档： <http://etherpad.org/doc/v1.9.3>
+- 上游应用代码库： <https://github.com/ether/etherpad-lite>
+- YunoHost 商店： <https://apps.yunohost.org/app/etherpad>
+- 报告 bug： <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade etherpad -u https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>
--- a/conf/systemd.service
+++ b/conf/systemd.service
@ -10,7 +10,7 @@ WorkingDirectory=__INSTALL_DIR__/
 Environment=ETHERPAD_PRODUCTION=true
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=__INSTALL_DIR__/src/bin/run.sh
+ExecStart=__INSTALL_DIR__/bin/run.sh
 Restart=always

 # Sandboxing options to harden security
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@ -1,3 +1,3 @@
-You can access Etherpad's admin panel at `__DOMAIN____PATH__/admin`. The configuration file for Etherpad is at the path `__INSTALL_DIR__/settings.json`.
+You can access Etherpad's admin panel at `__DOMAIN____PATH__admin`. The configuration file for Etherpad is at the path `__INSTALL_DIR__/settings.json`.

 *Skin Builder* (accessible at this address `__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) allows you to customize the skin of your pad. It will give you a parameter to copy into your configuration file `__INSTALL_DIR__/settings.json`.
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@ -1,3 +1,3 @@
-Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `__DOMAIN____PATH__/admin`. Le fichier de configuration d'Etherpad est `__INSTALL_DIR__/settings.json`.
+Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `__DOMAIN____PATH__admin`. Le fichier de configuration d'Etherpad est `__INSTALL_DIR__/settings.json`.

 *Skin Builder* (accessible à l'adresse `__INSTALL_DIR__/pad/p/test#skinvariantsbuilder`) vous permet de personnaliser l'apparence de votre pad. Il vous donnera un paramètre à copier dans votre fichier de configuration `__INSTALL_DIR__/settings.json`.
--- a/manifest.toml
+++ b/manifest.toml
@ -5,7 +5,7 @@ name = "Etherpad"
 description.en = "Online editor providing collaborative editing in real-time"
 description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel"

-version = "1.9.7~ynh1"
+version = "2.0.2~ynh1"

 maintainers = ["eric_G"]

@ -63,8 +63,8 @@ ram.runtime = "50M"

 [resources]
        [resources.sources.main]
-        url = "https://github.com/ether/etherpad-lite/archive/refs/tags/v1.9.7.tar.gz"
-        sha256 = "ea93e432f811c6a7e88f5eeb04c3c6fa5440df00a000d26cccbf9ea1b7217375"
+        url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.0.2.tar.gz"
+        sha256 = "5b5e47dbe7b07c3cafd8830780408f25141231b62f44ce9aa066329ed3223b4e"
        autoupdate.strategy = "latest_github_tag"

    [resources.ports]
--- a/scripts/install
+++ b/scripts/install
@ -84,7 +84,8 @@ ynh_script_progression --message="Installing $app..." --weight=10

 pushd $install_dir
 	ynh_use_nodejs
- 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh
+    ynh_exec_warn_less npm install pnpm -g
+ 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd

 #=================================================
--- a/scripts/restore
+++ b/scripts/restore
@ -34,6 +34,11 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=7
 # Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version

+pushd $install_dir
+ 	ynh_use_nodejs
+    ynh_exec_warn_less npm install pnpm -g
+popd
+
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -58,7 +58,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=1

-	ynh_setup_source --dest_dir="$install_dir" --keep="settings.json credentials.json"
+	ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="settings.json credentials.json"
 fi

 chmod -R o-rwx "$install_dir"
@ -114,7 +114,8 @@ ynh_script_progression --message="Installing $app..." --weight=60

 pushd $install_dir
 	ynh_use_nodejs
- 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh
+ 	ynh_exec_warn_less npm install pnpm -g
+ 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd

 #=================================================