From e826b85ff84d495e1051cdcafa393810eed5e488 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 8 Sep 2021 09:02:49 +0200 Subject: [PATCH 1/2] fix --- check_process | 6 +++--- doc/DESCRIPTION.md | 3 +++ screenshot.jpg => doc/screenshots/screenshot.jpg | Bin manifest.json | 12 +++++++++--- scripts/restore | 2 -- 5 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 doc/DESCRIPTION.md rename screenshot.jpg => doc/screenshots/screenshot.jpg (100%) diff --git a/check_process b/check_process index 4a3b94e..7de0578 100644 --- a/check_process +++ b/check_process @@ -1,8 +1,8 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - is_public=1 (PUBLIC|public=1|private=0) + domain="domain.tld" + path="/path" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..21110f5 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1,3 @@ +Rotate the Hexagon to prevent the blocks from stacking outside the outer grey hexagon! + +HEXTRIS is a fast paced puzzle game inspired by Tetris. Blocks start on the edges of the screen, and fall towards the inner blue hexagon. The objective of the game is to prevent the blocks from stacking outside the area of the grey hexagon. To do this, you must rotate the hexagon to manage different stacks of blocks on each face. Aim to connect 3 or more blocks of the same color: when 3 or more blocks of the same color touch each other, they are destroyed, and the blocks above them slide down! Destroying multiple series of blocks grants combos, whose durations are indicated by a quickly receding outline around the outer, grey hexagon. You lose once blocks on a face of the hexagon stack outside of the outer hexagon! \ No newline at end of file diff --git a/screenshot.jpg b/doc/screenshots/screenshot.jpg similarity index 100% rename from screenshot.jpg rename to doc/screenshots/screenshot.jpg diff --git a/manifest.json b/manifest.json index 8986440..00ea4b9 100644 --- a/manifest.json +++ b/manifest.json @@ -3,18 +3,24 @@ "id": "hextris", "packaging_format": 1, "description": { - "en": "A fast paced puzzle game.", + "en": "A fast paced puzzle game", "fr": "Un jeu de puzzle très rapide" }, - "version": "2020-05-05~ynh3", + "version": "2020-05-05~ynh4", "url": "http://hextris.github.io/", + "upstream": { + "license": "GPL-3.0", + "website": "http://hextris.github.io/", + "demo": "https://hextris.io/", + "code": "https://github.com/Hextris/Hextris" + }, "license": "GPL-3.0", "maintainer": { "name": "AerisOne", "email": "aeris@e.email" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.4" }, "multi_instance": true, "services": [ diff --git a/scripts/restore b/scripts/restore index 69d98c5..8873256 100755 --- a/scripts/restore +++ b/scripts/restore @@ -33,8 +33,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " From b2d23d5c4112eaa32d4e00b47468f2e19dac03c7 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 8 Sep 2021 07:02:56 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 50 +++++++++++++++++++++----------------------------- README_fr.md | 48 +++++++++++++++++++----------------------------- 2 files changed, 40 insertions(+), 58 deletions(-) diff --git a/README.md b/README.md index 4a0cc6a..9426e08 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ + + # Hextris for YunoHost [![Integration level](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) @@ -5,44 +10,29 @@ *[Lire ce readme en français.](./README_fr.md)* -*[Lire ce readme en français.](./README_fr.md)* - -> *This package allows you to install Hextris quickly and simply on a YunoHost server. +> *This package allows you to install Hextris 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.* ## Overview -An addictive puzzle game inspired by Tetris. -**Shipped version:** 2020-05-05 +Rotate the Hexagon to prevent the blocks from stacking outside the outer grey hexagon! + +HEXTRIS is a fast paced puzzle game inspired by Tetris. Blocks start on the edges of the screen, and fall towards the inner blue hexagon. The objective of the game is to prevent the blocks from stacking outside the area of the grey hexagon. To do this, you must rotate the hexagon to manage different stacks of blocks on each face. Aim to connect 3 or more blocks of the same color: when 3 or more blocks of the same color touch each other, they are destroyed, and the blocks above them slide down! Destroying multiple series of blocks grants combos, whose durations are indicated by a quickly receding outline around the outer, grey hexagon. You lose once blocks on a face of the hexagon stack outside of the outer hexagon! + +**Shipped version:** 2020-05-05~ynh4 + +**Demo:** https://hextris.io/ ## Screenshots -![](https://raw.githubusercontent.com/YunoHost-Apps/hextris_ynh/master/screenshot.jpg) +![](./doc/screenshots/screenshot.jpg) -## Demo +## Documentation and resources -* [Official demo](http://hextris.io/) -* [YunoHost demo](https://demo.yunohost.org/hextris/) - -## Documentation - - * Official documentation: https://github.com/Hextris/Hextris - * YunoHost documentation: https://yunohost.org/en/app_hextris - - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/hextris.svg)](https://ci-apps.yunohost.org/ci/apps/hextris/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/hextris.svg)](https://ci-apps-arm.yunohost.org/ci/apps/hextris/) - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/hextris_ynh/issues - * Hextris website: http://hextris.github.io/ - * Upstream app repository: https://github.com/Hextris/Hextris - * YunoHost website: https://yunohost.org/ - ---- +* Official app website: http://hextris.github.io/ +* Upstream app code repository: https://github.com/Hextris/Hextris +* YunoHost documentation for this app: https://yunohost.org/app_hextris +* Report a bug: https://github.com/YunoHost-Apps/hextris_ynh/issues ## Developer info @@ -54,3 +44,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/hextris_ynh/tree/test or sudo yunohost app upgrade hextris -u https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 4767895..94e5177 100644 --- a/README_fr.md +++ b/README_fr.md @@ -3,44 +3,32 @@ [![Niveau d'intégration](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) [![Installer Hextris avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hextris) -*[Read this readme in english.](./README.md)* +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d'installer Hextris rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* +> *Ce package vous permet d'installer Hextris rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble -Un puzzle addictif inspiré de Tetris. -**Version incluse :** 2020-05-05 +Rotate the Hexagon to prevent the blocks from stacking outside the outer grey hexagon! + +HEXTRIS is a fast paced puzzle game inspired by Tetris. Blocks start on the edges of the screen, and fall towards the inner blue hexagon. The objective of the game is to prevent the blocks from stacking outside the area of the grey hexagon. To do this, you must rotate the hexagon to manage different stacks of blocks on each face. Aim to connect 3 or more blocks of the same color: when 3 or more blocks of the same color touch each other, they are destroyed, and the blocks above them slide down! Destroying multiple series of blocks grants combos, whose durations are indicated by a quickly receding outline around the outer, grey hexagon. You lose once blocks on a face of the hexagon stack outside of the outer hexagon! + +**Version incluse :** 2020-05-05~ynh4 + +**Démo :** https://hextris.io/ ## Captures d'écran -![](https://raw.githubusercontent.com/YunoHost-Apps/hextris_ynh/master/screenshot.jpg) +![](./doc/screenshots/screenshot.jpg) -## Démo +## Documentations et ressources -* [Démo officielle](http://hextris.io/) -* [Démo YunoHost](https://demo.yunohost.org/hextris/) - -## Documentation - - * Documentation officielle : https://github.com/Hextris/Hextris - * Documentation YunoHost : https://yunohost.org/fr/app_hextris - - -#### Architectures supportées - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/hextris.svg)](https://ci-apps.yunohost.org/ci/apps/hextris/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/hextris.svg)](https://ci-apps-arm.yunohost.org/ci/apps/hextris/) - -## Liens - - * Signaler un bug : https://github.com/YunoHost-Apps/hextris_ynh/issues - * Site de l'application : http://hextris.github.io/ - * Dépôt de l'application principale : https://github.com/Hextris/Hextris - * Site web YunoHost : https://yunohost.org/ - ---- +* Site officiel de l'app : http://hextris.github.io/ +* Dépôt de code officiel de l'app : https://github.com/Hextris/Hextris +* Documentation YunoHost pour cette app : https://yunohost.org/app_hextris +* Signaler un bug : https://github.com/YunoHost-Apps/hextris_ynh/issues ## Informations pour les développeurs @@ -52,3 +40,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/hextris_ynh/tree/test ou sudo yunohost app upgrade hextris -u https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug ``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file