Merge pull request #11 from YunoHost-Apps/testing

Fix bookworm

ALL_README.md

@@ -1,6 +1,7 @@
 # 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.md

@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format.
 
-**Shipped version:** 3.0.6~ynh1
+**Shipped version:** 3.0.6~ynh2
 
 ## Screenshots
 

README_es.md

@@ -0,0 +1,47 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Joplin para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/joplin.svg)](https://dash.yunohost.org/appci/app/joplin) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/joplin.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/joplin.maintain.svg)
+
+[![Instalar Joplin con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=joplin)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarJoplin 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
+
+Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format.
+
+**Versión actual:** 3.0.6~ynh2
+
+## Capturas
+
+![Captura de Joplin](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://joplinapp.org/>
+- Documentación administrador oficial: <https://joplinapp.org/help/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/laurent22/joplin/>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/joplin>
+- Reportar un error: <https://github.com/YunoHost-Apps/joplin_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/joplin_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/joplin_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade joplin -u https://github.com/YunoHost-Apps/joplin_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -18,7 +18,7 @@ EZ editatu eskuz.
 
 Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format.
 
-**Paketatutako bertsioa:** 3.0.6~ynh1
+**Paketatutako bertsioa:** 3.0.6~ynh2
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 Joplin est une application gratuite et open source de prise de notes et de tâches, qui peut gérer un grand nombre de notes organisées dans des cahiers. Les notes sont consultables, peuvent être copiées, étiquetées et modifiées directement depuis les applications ou depuis votre propre éditeur de texte. Les notes sont au format Markdown.
 
-**Version incluse :** 3.0.6~ynh1
+**Version incluse :** 3.0.6~ynh2
 
 ## Captures d’écran
 

README_gl.md

@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format.
 
-**Versión proporcionada:** 3.0.6~ynh1
+**Versión proporcionada:** 3.0.6~ynh2
 
 ## Capturas de pantalla
 

README_zh_Hans.md

@@ -3,7 +3,7 @@
 请勿手动编辑。
 -->
 
-# YunoHost 的 Joplin
+# YunoHost 上的 Joplin
 
 [![集成程度](https://dash.yunohost.org/integration/joplin.svg)](https://dash.yunohost.org/appci/app/joplin) ![工作状态](https://ci-apps.yunohost.org/ci/badges/joplin.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/joplin.maintain.svg)
 
@@ -18,7 +18,7 @@
 
 Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format.
 
-**分发版本：** 3.0.6~ynh1
+**分发版本：** 3.0.6~ynh2
 
 ## 截图
 

manifest.toml

@@ -7,7 +7,7 @@ name = "Joplin"
 description.en = "Note taking and to-do application with synchronisation capabilities"
 description.fr = "Application de prise de notes et de tâches avec capacités de synchronisation"
 
-version = "3.0.6~ynh1"
+version = "3.0.6~ynh2"
 
 maintainers = ["eric_G"]
 
@@ -26,9 +26,9 @@ ldap = false
 
 sso = false
 
-disk = "50M"
+disk = "6G"
-ram.build = "50M"
+ram.build = "5G"
-ram.runtime = "50M"
+ram.runtime = "280M"
 
 [install]
     [install.domain]
@@ -66,7 +66,7 @@ ram.runtime = "50M"
     main.default = 22300
 
     [resources.apt]
-    packages = "postgresql, postgresql-client, python3-bcrypt"
+    packages = "postgresql, postgresql-client, python3-bcrypt, rsync"
     extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main"
     extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg"
     extras.yarn.packages = "yarn"

scripts/backup

@@ -22,15 +22,11 @@ ynh_print_info --message="Declaring files to be backed up..."
 ynh_backup --src_path="$install_dir"
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# BACKUP SYSTEMD
-#=================================================
-
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 #=================================================

scripts/install

@@ -69,9 +69,9 @@ ynh_script_progression --message="Building $app..." --weight=10
 
 pushd $install_dir/packages/server
  	ynh_use_nodejs
-	sudo -u $app env $ynh_node_load_PATH BUILD_SEQUENCIAL=1 yarn install --inline-builds
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH BUILD_SEQUENCIAL=1 yarn install --inline-builds
-	sudo -u $app env $ynh_node_load_PATH yarn build
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn build
-	sudo -u $app env $ynh_node_load_PATH yarn cache clean
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean
 	ynh_secure_remove .yarn/berry
 popd
 

scripts/upgrade

@@ -9,8 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
@@ -23,14 +21,10 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
 ynh_script_progression --message="Upgrading source files..." --weight=1
 
 # Download, check integrity, uncompress and patch the source from manifest.toml
 ynh_setup_source --dest_dir="$install_dir" --keep=".env"
-fi
 
 chown -R $app:www-data "$install_dir"
 
@@ -45,18 +39,16 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 #=================================================
 # BUILD
 #=================================================
-
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
 ynh_script_progression --message="Building $app..." --weight=10
+
 pushd $install_dir/packages/server
   ynh_use_nodejs
-    sudo -u $app env $ynh_node_load_PATH BUILD_SEQUENCIAL=1 yarn install --inline-builds
+  ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH BUILD_SEQUENCIAL=1 yarn install --inline-builds
-    sudo -u $app env $ynh_node_load_PATH yarn build
+  ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn build
-    sudo -u $app env $ynh_node_load_PATH yarn cache clean
+  ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean
   ynh_secure_remove .yarn/berry
 popd
-fi
+
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS