Merge pull request #22 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)
+- [Lee 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 Libremdb with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libremdb)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install Libremdb 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.*
@@ -27,7 +27,7 @@ A free & open source IMDb front-end.
 
 
 
-**Shipped version:** 3.3.0~ynh1
+**Shipped version:** 3.4.0~ynh1
 
 **Demo:** <https://libremdb.iket.me/about>
 

README_es.md

@@ -0,0 +1,57 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Libremdb para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/libremdb.svg)](https://dash.yunohost.org/appci/app/libremdb) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/libremdb.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/libremdb.maintain.svg)
+
+[![Instalar Libremdb con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libremdb)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarLibremdb 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
+
+A free & open source IMDb front-end.
+
+### Features
+
+- Browse any movie info without being tracked or bombarded by annoying ads.
+- Modern interface with curated colors supporting both dark and light themes.
+- Be it your small mobile or big computer screen, it’s fully responsive.
+- Lightweight
+
+
+
+**Versión actual:** 3.4.0~ynh1
+
+**Demo:** <https://libremdb.iket.me/about>
+
+## Capturas
+
+![Captura de Libremdb](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://libremdb.iket.me/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/zyachel/libremdb>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/libremdb>
+- Reportar un error: <https://github.com/YunoHost-Apps/libremdb_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/libremdb_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/libremdb_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade libremdb -u https://github.com/YunoHost-Apps/libremdb_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -0,0 +1,57 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Libremdb YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/libremdb.svg)](https://dash.yunohost.org/appci/app/libremdb) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/libremdb.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/libremdb.maintain.svg)
+
+[![Instalatu Libremdb YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libremdb)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Libremdb YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+A free & open source IMDb front-end.
+
+### Features
+
+- Browse any movie info without being tracked or bombarded by annoying ads.
+- Modern interface with curated colors supporting both dark and light themes.
+- Be it your small mobile or big computer screen, it’s fully responsive.
+- Lightweight
+
+
+
+**Paketatutako bertsioa:** 3.4.0~ynh1
+
+**Demoa:** <https://libremdb.iket.me/about>
+
+## Pantaila-argazkiak
+
+![Libremdb(r)en pantaila-argazkia](./doc/screenshots/screenshot.png)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://libremdb.iket.me/>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/zyachel/libremdb>
+- YunoHost Denda: <https://apps.yunohost.org/app/libremdb>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/libremdb_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/libremdb_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/libremdb_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade libremdb -u https://github.com/YunoHost-Apps/libremdb_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -27,7 +27,7 @@ A free & open source IMDb front-end.
 
 
 
-**Version incluse :** 3.3.0~ynh1
+**Version incluse :** 3.4.0~ynh1
 
 **Démo :** <https://libremdb.iket.me/about>
 

README_gl.md

@@ -27,7 +27,7 @@ A free & open source IMDb front-end.
 
 
 
-**Versión proporcionada:** 3.3.0~ynh1
+**Versión proporcionada:** 3.4.0~ynh1
 
 **Demo:** <https://libremdb.iket.me/about>
 

README_zh_Hans.md

@@ -0,0 +1,57 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 Libremdb
+
+[![集成程度](https://dash.yunohost.org/integration/libremdb.svg)](https://dash.yunohost.org/appci/app/libremdb) ![工作状态](https://ci-apps.yunohost.org/ci/badges/libremdb.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/libremdb.maintain.svg)
+
+[![使用 YunoHost 安装 Libremdb](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libremdb)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Libremdb。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+A free & open source IMDb front-end.
+
+### Features
+
+- Browse any movie info without being tracked or bombarded by annoying ads.
+- Modern interface with curated colors supporting both dark and light themes.
+- Be it your small mobile or big computer screen, it’s fully responsive.
+- Lightweight
+
+
+
+**分发版本：** 3.4.0~ynh1
+
+**演示：** <https://libremdb.iket.me/about>
+
+## 截图
+
+![Libremdb 的截图](./doc/screenshots/screenshot.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://libremdb.iket.me/>
+- 上游应用代码库： <https://github.com/zyachel/libremdb>
+- YunoHost 商店： <https://apps.yunohost.org/app/libremdb>
+- 报告 bug： <https://github.com/YunoHost-Apps/libremdb_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/libremdb_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/libremdb_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade libremdb -u https://github.com/YunoHost-Apps/libremdb_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

conf/systemd.service

@@ -6,7 +6,7 @@ After=network.target
 Type=simple
 User=__APP__
 Group=__APP__
-Environment="PATH=__ENV_PATH__"
+Environment="__YNH_NODE_LOAD_PATH__"
 Environment="NODE_ENV=production"
 WorkingDirectory=__INSTALL_DIR__/
 ExecStart=/usr/bin/yarn start -p __PORT__

manifest.toml

@@ -5,7 +5,7 @@ name = "Libremdb"
 description.en = "Free & open source IMDb front-end"
 description.fr = "Frontal IMDb gratuit et open source"
 
-version = "3.3.0~ynh1"
+version = "3.4.0~ynh1"
 
 maintainers = []
 
@@ -19,8 +19,11 @@ code = "https://github.com/zyachel/libremdb"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
@@ -35,8 +38,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/zyachel/libremdb/archive/refs/tags/v3.3.0.tar.gz"
+        url = "https://github.com/zyachel/libremdb/archive/refs/tags/v3.4.0.tar.gz"
-        sha256 = "f7ecc1c8ed695909f6dca82e58809b1bcfcc3c76c7121f56b71365301ec5c025"
+        sha256 = "096a5eb2212a8afa0c580bac3a53f83d5531d58df7f860925fb62031f1c15797"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.ports]

scripts/change_url

@@ -32,7 +32,7 @@ ynh_script_progression --message="Changing app configuration file..." --weight=1
 
 domain="$old_domain"
 
-ynh_add_config --template="../conf/.env.local.example" --destination="$install_dir/.env.local"
+ynh_add_config --template=".env.local.example" --destination="$install_dir/.env.local"
 
 chmod 400 "$install_dir/.env.local"
 chown $app:$app "$install_dir/.env.local"

scripts/install

@@ -48,21 +48,19 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/.env.local.example" --destination="$install_dir/.env.local"
+ynh_add_config --template=".env.local.example" --destination="$install_dir/.env.local"
 
 chmod 400 "$install_dir/.env.local"
 chown $app:$app "$install_dir/.env.local"
 
-
 #=================================================
 # INSTALL LIBREMDB
 #=================================================
-ynh_script_progression --message="Building the app..." --weight=20
+ynh_script_progression --message="Building $app..." --weight=20
 
 pushd $install_dir
 	ynh_use_nodejs
-	corepack enable
+	ynh_exec_warn_less npm install pnpm -g
-	corepack prepare pnpm@latest --activate
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
 popd
@@ -72,15 +70,9 @@ popd
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
-env_path="$PATH"
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
 yunohost service add $app --description="IMDb front-end" --log="/var/log/$app/$app.log"
 
 #=================================================

scripts/remove

@@ -22,34 +22,14 @@ then
 	yunohost service remove $app
 fi
 
-#=================================================
-# STOP AND REMOVE SERVICE
-#=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
-
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 
-#=================================================
-# REMOVE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
-
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE THE REDIS DATABASE
-#=================================================
-ynh_script_progression --message="Removing the redis database..."
-
 ynh_redis_remove_db "$redis_db"
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
-
 # Remove NodeJS
 ynh_remove_nodejs
 

scripts/restore

@@ -33,39 +33,22 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# RESTORE SYSTEMD
-#=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
-
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
 yunohost service add $app --description="IMDb front-end" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
+ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX AND PHP-FPM
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================

scripts/upgrade

@@ -35,6 +35,14 @@ if [ -z "$redis_db" ]; then
 	ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
 fi
 
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Upgrading dependencies..." --weight=1
+
+# Install Nodejs
+ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -45,25 +53,25 @@ then
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$install_dir"
+	chmod -R o-rwx "$install_dir"
+	chown -R $app:www-data "$install_dir"
+  pushd $install_dir
+    ynh_use_nodejs
+    ynh_exec_warn_less npm install pnpm -g
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
+  popd
 fi
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=1
-
-# Install Nodejs
-ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
-
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/.env.local.example" --destination="$install_dir/.env.local"
+ynh_add_config --template=".env.local.example" --destination="$install_dir/.env.local"
 
 chmod 400 "$install_dir/.env.local"
 chown $app:$app "$install_dir/.env.local"
@@ -81,7 +89,6 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 
-env_path="$PATH"
 # Create a dedicated systemd config
 ynh_add_systemd_config