diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,6 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [Baca README dalam bahasa bahasa Indonesia](README_id.md) +- [Прочитать README на русский](README_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 06e470f..ba2a12e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # 20 euros for YunoHost -[![Integration level](https://dash.yunohost.org/integration/20euros.svg)](https://dash.yunohost.org/appci/app/20euros) ![Working status](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) ![Working status](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) [![Install 20 euros with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) diff --git a/README_es.md b/README_es.md index 2d6f8ff..6d8e700 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # 20 euros para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/20euros.svg)](https://dash.yunohost.org/appci/app/20euros) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) [![Instalar 20 euros con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) diff --git a/README_eu.md b/README_eu.md index f466dee..b2f373d 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # 20 euros YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/20euros.svg)](https://dash.yunohost.org/appci/app/20euros) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) [![Instalatu 20 euros YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) diff --git a/README_fr.md b/README_fr.md index 1b82056..d2ac2a3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # 20 euros pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/20euros.svg)](https://dash.yunohost.org/appci/app/20euros) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) [![Installer 20 euros avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) diff --git a/README_gl.md b/README_gl.md index b2b0b9d..be119bb 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # 20 euros para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/20euros.svg)](https://dash.yunohost.org/appci/app/20euros) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) [![Instalar 20 euros con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..c9e571e --- /dev/null +++ b/README_id.md @@ -0,0 +1,49 @@ + + +# 20 euros untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) + +[![Pasang 20 euros dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang 20 euros secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +Variante de 2048 avec pièces et billets en euros. + +**Versi terkirim:** 1.0~ynh9 + +## Tangkapan Layar + +![Tangkapan Layar pada 20 euros](./doc/screenshots/Screenshot-20euros.jpg) + +## :red_circle: Antifitur + +- **Non-free assets**: Contains and makes use of non-free assets. The most common case is apps using artwork - images, sounds, music, etc. - under a commercial license. + +## Dokumentasi dan sumber daya + +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/20euros_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/20euros_ynh/tree/testing --debug +atau +sudo yunohost app upgrade 20euros -u https://github.com/YunoHost-Apps/20euros_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..23bafec --- /dev/null +++ b/README_ru.md @@ -0,0 +1,49 @@ + + +# 20 euros для YunoHost + +[![Уровень интеграции](https://dash.yunohost.org/integration/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) + +[![Установите 20 euros с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) + +*[Прочтите этот README на других языках.](./ALL_README.md)* + +> *Этот пакет позволяет Вам установить 20 euros быстро и просто на YunoHost-сервер.* +> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* + +## Обзор + +Variante de 2048 avec pièces et billets en euros. + +**Поставляемая версия:** 1.0~ynh9 + +## Снимки экрана + +![Снимок экрана 20 euros](./doc/screenshots/Screenshot-20euros.jpg) + +## :red_circle: Анти-функции + +- **Non-free assets**: Contains and makes use of non-free assets. The most common case is apps using artwork - images, sounds, music, etc. - under a commercial license. + +## Документация и ресурсы + +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/20euros_ynh/tree/testing). + +Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/20euros_ynh/tree/testing --debug +или +sudo yunohost app upgrade 20euros -u https://github.com/YunoHost-Apps/20euros_ynh/tree/testing --debug +``` + +**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 28378d2..1c6a2d5 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 20 euros -[![集成程度](https://dash.yunohost.org/integration/20euros.svg)](https://dash.yunohost.org/appci/app/20euros) ![工作状态](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/20euros.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg) [![使用 YunoHost 安装 20 euros](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=20euros) diff --git a/manifest.toml b/manifest.toml index 98844d1..cea30b2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -14,7 +14,8 @@ license = "MIT" code = "https://github.com/jatekos101/20euros" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.29" +helpers_version = "2.1" architectures = "all" multi_instance = true @@ -52,6 +53,7 @@ ram.runtime = "50M" [resources.system_user] [resources.install_dir] + group = "www-data:r-x" [resources.permissions] main.url = "/" diff --git a/scripts/backup b/scripts/backup index a6b113b..24cbaff 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,32 +1,23 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers -#================================================= -# DECLARE DATA AND CONF FILES TO BACKUP -#================================================= -ynh_print_info --message="Declaring files to be backed up..." +ynh_print_info "Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$install_dir" +ynh_backup "$install_dir" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index f96dd50..1110fff 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,29 +1,23 @@ #!/bin/bash -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --weight=3 +ynh_script_progression "Updating NGINX web server configuration..." -ynh_change_url_nginx_config +ynh_config_change_url_nginx #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=2 +ynh_script_progression "Reloading NGINX web server..." -ynh_systemd_action --service_name=nginx --action=reload +ynh_systemctl --service=nginx --action=reload #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression "Change of URL completed for $app" diff --git a/scripts/install b/scripts/install index 44f96c1..6e41a80 100755 --- a/scripts/install +++ b/scripts/install @@ -1,19 +1,11 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers -#================================================= -# STANDARD MODIFICATIONS #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=2 +ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir" @@ -22,23 +14,12 @@ mv $install_dir/'20 Euro.html' "$install_dir/index.html" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=3 +ynh_script_progression "Configuring NGINX web server..." -# Create a dedicated NGINX config -ynh_add_nginx_config - -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions to app files -chown -R $app:www-data $install_dir -chmod o-rwx $install_dir +ynh_config_add_nginx #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression "Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index 2952ff1..b3575da 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,23 +1,16 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +ynh_script_progression "Removing NGINX web server configuration..." -# Remove the dedicated NGINX config -ynh_remove_nginx_config +ynh_config_remove_nginx #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression "Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index 44176fb..3543d9f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers #================================================= @@ -14,34 +8,24 @@ source /usr/share/yunohost/helpers # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring $app main directory..." --weight=2 +ynh_script_progression "Restoring $app main directory..." -ynh_restore_file --origin_path="$install_dir" +ynh_restore "$install_dir" -#================================================= -# RESTORE USER RIGHTS -#================================================= - -# Restore permissions on app files -chown -R $app:www-data $install_dir -chmod o-rwx $install_dir - -#================================================= -# GENERIC FINALIZATION #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=3 +ynh_script_progression "Reloading NGINX web server..." -ynh_systemd_action --service_name=nginx --action=reload +ynh_systemctl --service=nginx --action=reload #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression "Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index 923c819..c3cc37e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,50 +1,24 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression "Upgrading source files..." -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=4 - - # Download the source from ../sources - mkdir -p $install_dir - cp -a ../sources/* $install_dir -fi +mkdir -p $install_dir +cp -a ../sources/* $install_dir #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 +ynh_script_progression "Upgrading NGINX web server configuration..." -# Create a dedicated NGINX config -ynh_add_nginx_config - -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions on app files -chown -R $app:www-data $install_dir -chmod o-rwx $install_dir +ynh_config_add_nginx #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression "Upgrade of $app completed" diff --git a/tests.toml b/tests.toml index 0544ce1..d64ef3c 100644 --- a/tests.toml +++ b/tests.toml @@ -5,5 +5,3 @@ test_format = 1.0 # ------------ # Tests to run # ------------ - - exclude ="install.nourl"