From bd057a40e5a4d1b331095657b1d30f6e33ed19b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 17 May 2024 12:31:44 +0200 Subject: [PATCH 1/6] fix --- conf/nginx.conf | 2 +- scripts/upgrade | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 82a7612..76228b3 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __INSTALL_DIR__/; + alias __INSTALL_DIR__/dist/; #index index.php; diff --git a/scripts/upgrade b/scripts/upgrade index 96211e8..715dd21 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= From a0a24afbff2ddcbb5fa4e09618b3a622507456ea Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 May 2024 10:31:49 +0000 Subject: [PATCH 2/6] Auto-update READMEs --- ALL_README.md | 4 +++- README.md | 2 +- README_es.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 README_es.md create mode 100644 README_eu.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..8938aae 100644 --- a/ALL_README.md +++ b/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) diff --git a/README.md b/README.md index c1ccb35..02740b6 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install Digisteps with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digisteps) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install Digisteps 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.* diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..222c254 --- /dev/null +++ b/README_es.md @@ -0,0 +1,45 @@ + + +# Digisteps para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/digisteps.svg)](https://dash.yunohost.org/appci/app/digisteps) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/digisteps.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/digisteps.maintain.svg) + +[![Instalar Digisteps con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digisteps) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarDigisteps 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 + +Create simple online educational pathes + +**Versión actual:** 0.5.16~ynh1 + +**Demo:** +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación usuario oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/digisteps_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/digisteps_ynh/tree/testing --debug +o +sudo yunohost app upgrade digisteps -u https://github.com/YunoHost-Apps/digisteps_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..4fc4109 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,45 @@ + + +# Digisteps YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/digisteps.svg)](https://dash.yunohost.org/appci/app/digisteps) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/digisteps.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/digisteps.maintain.svg) + +[![Instalatu Digisteps YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digisteps) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Digisteps YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Create simple online educational pathes + +**Paketatutako bertsioa:** 0.5.16~ynh1 + +**Demoa:** +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Erabiltzaileen dokumentazio ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/digisteps_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/digisteps_ynh/tree/testing --debug +edo +sudo yunohost app upgrade digisteps -u https://github.com/YunoHost-Apps/digisteps_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..461c5df --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,45 @@ + + +# YunoHost 上的 Digisteps + +[![集成程度](https://dash.yunohost.org/integration/digisteps.svg)](https://dash.yunohost.org/appci/app/digisteps) ![工作状态](https://ci-apps.yunohost.org/ci/badges/digisteps.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/digisteps.maintain.svg) + +[![使用 YunoHost 安装 Digisteps](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digisteps) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Digisteps。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Create simple online educational pathes + +**分发版本：** 0.5.16~ynh1 + +**演示：** +## 文档与资源 + +- 官方应用网站： +- 官方用户文档： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/digisteps_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/digisteps_ynh/tree/testing --debug +或 +sudo yunohost app upgrade digisteps -u https://github.com/YunoHost-Apps/digisteps_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 878dbb2d188648c645f673d0e06b08f38d19681a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 17 May 2024 12:34:57 +0200 Subject: [PATCH 3/6] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 715dd21..f0b707c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Upgrading source files..." --weight=1 -ynh_setup_source --dest_dir="$install_dir" --keep="inc/digiwords.db" +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="inc/digiwords.db" chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" From d282f113ace77e654e3927dab43127e7f7df9f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 17 May 2024 12:41:26 +0200 Subject: [PATCH 4/6] cleaning --- manifest.toml | 2 +- scripts/backup | 2 +- scripts/install | 4 ++-- scripts/remove | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest.toml b/manifest.toml index 98de39d..5242f29 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Digisteps" description.en = "Create simple online educational pathes" description.fr = "Créer des parcours pédagogiques simples en ligne" -version = "0.5.16~ynh1" +version = "0.5.16~ynh2" maintainers = ["Pierre-Amiel Giraud"] diff --git a/scripts/backup b/scripts/backup index eedff3c..c207d85 100644 --- a/scripts/backup +++ b/scripts/backup @@ -22,7 +22,7 @@ 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" diff --git a/scripts/install b/scripts/install index ae8982d..54da618 100644 --- a/scripts/install +++ b/scripts/install @@ -20,9 +20,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# NGINX CONFIGURATION +# APP INITIAL CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 +ynh_script_progression --message="Adding $app's configuration files..." --weight=1 ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index ac762c0..a6a8ac5 100644 --- a/scripts/remove +++ b/scripts/remove @@ -10,9 +10,9 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE NGINX CONFIGURATION +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index 908cf16..7aac2b5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,9 +20,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# RESTORE THE PHP-FPM CONFIGURATION +# RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index f0b707c..337a00d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,9 +20,9 @@ chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" #================================================= -# NGINX CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 ynh_add_nginx_config From 7465d77fd8e54a09eab8890c1206622abf0c881f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 May 2024 10:41:31 +0000 Subject: [PATCH 5/6] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 02740b6..7d2011d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Create simple online educational pathes -**Shipped version:** 0.5.16~ynh1 +**Shipped version:** 0.5.16~ynh2 **Demo:** ## Documentation and resources diff --git a/README_es.md b/README_es.md index 222c254..58fa4ab 100644 --- a/README_es.md +++ b/README_es.md @@ -18,7 +18,7 @@ No se debe editar a mano. Create simple online educational pathes -**Versión actual:** 0.5.16~ynh1 +**Versión actual:** 0.5.16~ynh2 **Demo:** ## Documentaciones y recursos diff --git a/README_eu.md b/README_eu.md index 4fc4109..3862b54 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Create simple online educational pathes -**Paketatutako bertsioa:** 0.5.16~ynh1 +**Paketatutako bertsioa:** 0.5.16~ynh2 **Demoa:** ## Dokumentazioa eta baliabideak diff --git a/README_fr.md b/README_fr.md index 565eeb3..b0fc8a4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Create simple online educational pathes -**Version incluse :** 0.5.16~ynh1 +**Version incluse :** 0.5.16~ynh2 **Démo :** ## Documentations et ressources diff --git a/README_gl.md b/README_gl.md index f8dfb66..4fdf8fa 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. Create simple online educational pathes -**Versión proporcionada:** 0.5.16~ynh1 +**Versión proporcionada:** 0.5.16~ynh2 **Demo:** ## Documentación e recursos diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 461c5df..142cbd5 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Create simple online educational pathes -**分发版本：** 0.5.16~ynh1 +**分发版本：** 0.5.16~ynh2 **演示：** ## 文档与资源 From 1f3d0667cbc8ab0d1793fab732b48f308b0f7484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 17 May 2024 15:13:48 +0200 Subject: [PATCH 6/6] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 337a00d..03cc0db 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Upgrading source files..." --weight=1 -ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="inc/digiwords.db" +ynh_setup_source --dest_dir="$install_dir" --keep="inc/digiwords.db" chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir"