Merge pull request #51 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -1,6 +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)
-- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -9,7 +9,7 @@ It shall NOT be edited by hand.
 
 [![Install TiddlyWiki with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tiddlywiki)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install TiddlyWiki 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.*
@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.
 
-**Shipped version:** 5.3.3~ynh1
+**Shipped version:** 5.3.3~ynh2
 
 **Demo:** <https://tiddlywiki.com/>
 

README_es.md

@@ -0,0 +1,49 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# TiddlyWiki para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/tiddlywiki.svg)](https://dash.yunohost.org/appci/app/tiddlywiki) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.maintain.svg)
+
+[![Instalar TiddlyWiki con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tiddlywiki)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarTiddlyWiki 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
+
+TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.
+
+**Versión actual:** 5.3.3~ynh2
+
+**Demo:** <https://tiddlywiki.com/>
+
+## Capturas
+
+![Captura de TiddlyWiki](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://tiddlywiki.com/>
+- Documentación administrador oficial: <https://tiddlywiki.com/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/Jermolene/TiddlyWiki5>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/tiddlywiki>
+- Reportar un error: <https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade tiddlywiki -u https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -0,0 +1,49 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# TiddlyWiki YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/tiddlywiki.svg)](https://dash.yunohost.org/appci/app/tiddlywiki) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.maintain.svg)
+
+[![Instalatu TiddlyWiki YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tiddlywiki)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek TiddlyWiki YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.
+
+**Paketatutako bertsioa:** 5.3.3~ynh2
+
+**Demoa:** <https://tiddlywiki.com/>
+
+## Pantaila-argazkiak
+
+![TiddlyWiki(r)en pantaila-argazkia](./doc/screenshots/screenshot.png)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://tiddlywiki.com/>
+- Administratzaileen dokumentazio ofiziala: <https://tiddlywiki.com/>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/Jermolene/TiddlyWiki5>
+- YunoHost Denda: <https://apps.yunohost.org/app/tiddlywiki>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade tiddlywiki -u https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 TiddlyWiki est un wiki interactif complet en JavaScript. Il peut être utilisé comme un seul fichier HTML dans le navigateur ou comme une puissante application Node.js (cette dernière est utilisée pour YunoHost). Il est hautement personnalisable : toute l'interface utilisateur est elle-même implémentée dans WikiText modifiable.
 
-**Version incluse :** 5.3.3~ynh1
+**Version incluse :** 5.3.3~ynh2
 
 **Démo :** <https://tiddlywiki.com/>
 

README_gl.md

@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.
 
-**Versión proporcionada:** 5.3.3~ynh1
+**Versión proporcionada:** 5.3.3~ynh2
 
 **Demo:** <https://tiddlywiki.com/>
 

README_zh_Hans.md

@@ -0,0 +1,49 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 TiddlyWiki
+
+[![集成程度](https://dash.yunohost.org/integration/tiddlywiki.svg)](https://dash.yunohost.org/appci/app/tiddlywiki) ![工作状态](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.maintain.svg)
+
+[![使用 YunoHost 安装 TiddlyWiki](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tiddlywiki)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 TiddlyWiki。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.
+
+**分发版本：** 5.3.3~ynh2
+
+**演示：** <https://tiddlywiki.com/>
+
+## 截图
+
+![TiddlyWiki 的截图](./doc/screenshots/screenshot.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://tiddlywiki.com/>
+- 官方管理文档： <https://tiddlywiki.com/>
+- 上游应用代码库： <https://github.com/Jermolene/TiddlyWiki5>
+- YunoHost 商店： <https://apps.yunohost.org/app/tiddlywiki>
+- 报告 bug： <https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade tiddlywiki -u https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

manifest.toml

@@ -5,7 +5,7 @@ name = "TiddlyWiki"
 description.en = "Non-linear personal web notebook"
 description.fr = "Carnet Web personnel non linéaire"
 
-version = "5.3.3~ynh1"
+version = "5.3.3~ynh2"
 
 maintainers = ["eric_G"]
 
@@ -20,7 +20,7 @@ fund = "https://opencollective.com/tiddlywiki"
 [integration]
 yunohost = ">= 11.2"
 architectures = "all"
-multi_instance = false
+multi_instance = true
 
 ldap = false
 

scripts/_common.sh

@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-nodejs_version="18"
+nodejs_version="20"
 
 #=================================================
 # PERSONAL HELPERS

scripts/backup

@@ -28,15 +28,11 @@ ynh_backup --src_path="$install_dir"
 ynh_backup --src_path="$data_dir" --is_big
 
 #=================================================
-# 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

@@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers
 ynh_script_progression --message="Installing dependencies..."
 
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
-ynh_use_nodejs
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -39,16 +38,17 @@ ynh_add_nginx_config
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-yunohost service add $app --description="A non-linear personal web notebook"
+yunohost service add $app --description="A non-linear personal web notebook" --log="/var/log/$app/$app.log"
 
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2
+ynh_script_progression --message="Configuring $app..." --weight=2
 
 if [ ! -f $data_dir/tiddlywiki.info ]
 then
 	pushd $install_dir
+		ynh_use_nodejs
 		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ./tiddlywiki.js $data_dir --init server
 	popd
 fi

scripts/restore

@@ -52,7 +52,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
 
-yunohost service add $app --description="A non-linear personal web notebook"
+yunohost service add $app --description="A non-linear personal web notebook" --log="/var/log/$app/$app.log"
 
 #=================================================
 # GENERIC FINALIZATION

scripts/upgrade

@@ -9,12 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -27,14 +21,10 @@ ynh_systemd_action --service_name=$app --action="stop"
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..."
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+# Download, check integrity, uncompress and patch the source from app.src
-then
+ynh_setup_source --dest_dir="$install_dir" --full_replace=1
-	ynh_script_progression --message="Upgrading source files..."
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir"
-fi
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -45,7 +35,6 @@ chown -R $app:www-data "$install_dir"
 ynh_script_progression --message="Upgrading dependencies..." --weight=1
 
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
-ynh_use_nodejs
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
@@ -58,7 +47,7 @@ ynh_add_nginx_config
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-yunohost service add $app --description="A non-linear personal web notebook"
+yunohost service add $app --description="A non-linear personal web notebook" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE