From 040163a11a36e634c9c3ede1c9e1149db36a73a4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Nov 2021 13:25:42 +0100 Subject: [PATCH 01/13] Fix linter warning --- manifest.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 00ea4b9..4bc6a63 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A fast paced puzzle game", "fr": "Un jeu de puzzle très rapide" }, - "version": "2020-05-05~ynh4", + "version": "2020.05.05~ynh4", "url": "http://hextris.github.io/", "upstream": { "license": "GPL-3.0", @@ -30,8 +30,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", From 6f6eca0a06b1282bbaef17d83858caf8f8dc8685 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot Date: Sat, 13 Nov 2021 12:25:48 +0000 Subject: [PATCH 02/13] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9426e08..aca88fd 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Rotate the Hexagon to prevent the blocks from stacking outside the outer grey he 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 +**Shipped version:** 2020.05.05~ynh4 **Demo:** https://hextris.io/ diff --git a/README_fr.md b/README_fr.md index 94e5177..5596e2b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ Rotate the Hexagon to prevent the blocks from stacking outside the outer grey he 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 +**Version incluse :** 2020.05.05~ynh4 **Démo :** https://hextris.io/ From 8ef2c239d8e466ec1239b8546e19baf7d2b4469f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 10 Sep 2022 19:17:42 +0000 Subject: [PATCH 03/13] Auto-update README --- README.md | 18 ++++++++++-------- README_fr.md | 26 ++++++++++++++++---------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index aca88fd..f10694f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # 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) +[![Integration level](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![Working status](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) [![Install Hextris with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hextris) *[Lire ce readme en français.](./README_fr.md)* @@ -21,28 +21,30 @@ HEXTRIS is a fast paced puzzle game inspired by Tetris. Blocks start on the edge **Shipped version:** 2020.05.05~ynh4 + **Demo:** https://hextris.io/ ## Screenshots -![](./doc/screenshots/screenshot.jpg) +![Screenshot of Hextris](./doc/screenshots/screenshot.jpg) ## Documentation and resources -* 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 +* Official app website: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/hextris_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug 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 +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 5596e2b..9ce7f94 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Hextris pour YunoHost -[![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) +[![Niveau d'intégration](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![Statut de maintenance](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)* -*[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, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -15,30 +19,32 @@ Rotate the Hexagon to prevent the blocks from stacking outside the outer grey he 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 +**Version incluse :** 2020.05.05~ynh4 + **Démo :** https://hextris.io/ ## Captures d'écran -![](./doc/screenshots/screenshot.jpg) +![Capture d'écran de Hextris](./doc/screenshots/screenshot.jpg) ## Documentations et ressources -* 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 +* Site officiel de l'app : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/hextris_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug 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 +**Plus d'infos sur le packaging d'applications :** From d538a5dfd85c291018bdde96eefe206612f66c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 14 Oct 2022 09:42:54 +0200 Subject: [PATCH 04/13] Bump to 4.3.0 (#37) * 4.3.0 * Auto-update README * Fix linter * Auto-update README Co-authored-by: yunohost-bot --- check_process | 8 ++------ conf/nginx.conf | 7 +------ manifest.json | 6 +++--- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/check_process b/check_process index 7de0578..489a614 100644 --- a/check_process +++ b/check_process @@ -11,8 +11,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=6f4c1e5f81bea341c07e199c4916fc31b54eaf61 - upgrade=1 from_commit=ec4da0af3abbd7b8bd59d5f7d9d7c594ae844ac0 + upgrade=1 from_commit=bfdb624f86329cb5095cb3a343fc54e84d001c70 backup_restore=1 multi_instance=1 port_already_use=0 @@ -21,8 +20,5 @@ Email= Notification=none ;;; Upgrade options - ; commit=6f4c1e5f81bea341c07e199c4916fc31b54eaf61 - name=Global refactoring - manifest_arg=domain=DOMAIN&path=PATH&is_public=1& - ; commit=ec4da0af3abbd7b8bd59d5f7d9d7c594ae844ac0 + ; commit=bfdb624f86329cb5095cb3a343fc54e84d001c70 name=1.1-ynh3 diff --git a/conf/nginx.conf b/conf/nginx.conf index 549ae0e..864573c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,12 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/ ; - - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } + alias __FINALPATH__/; index index.html; diff --git a/manifest.json b/manifest.json index 4bc6a63..f42e19d 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "hextris", "packaging_format": 1, "description": { - "en": "A fast paced puzzle game", - "fr": "Un jeu de puzzle très rapide" + "en": "Fast paced puzzle game", + "fr": "Jeu de puzzle très rapide" }, "version": "2020.05.05~ynh4", "url": "http://hextris.github.io/", @@ -20,7 +20,7 @@ "email": "aeris@e.email" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ From 08b5eda80ff5004539651648b3daabe562ed681a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 14 Oct 2022 07:42:58 +0000 Subject: [PATCH 05/13] Auto-update README --- README.md | 1 - README_fr.md | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index f10694f..943be27 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ HEXTRIS is a fast paced puzzle game inspired by Tetris. Blocks start on the edge **Shipped version:** 2020.05.05~ynh4 - **Demo:** https://hextris.io/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index 9ce7f94..daba555 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,8 +19,7 @@ Rotate the Hexagon to prevent the blocks from stacking outside the outer grey he 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 - +**Version incluse :** 2020.05.05~ynh4 **Démo :** https://hextris.io/ From bec720c2d26e7e86b45e153b4c7f1b9b6c28f83c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 16 Oct 2022 21:36:48 +0200 Subject: [PATCH 06/13] Appy last example_ynh --- .gitignore | 1 - check_process | 1 + conf/app.src | 1 + doc/DESCRIPTION.md | 10 +++++++--- doc/DESCRIPTION_fr.md | 7 +++++++ doc/DISCLAIMER.md | 0 doc/DISCLAIMER_fr.md | 0 manifest.json | 4 ++-- scripts/_common.sh | 1 - scripts/backup | 7 +++++-- scripts/change_url | 4 ++-- scripts/install | 11 +++++++++-- scripts/remove | 2 +- scripts/restore | 21 +++++++++++++-------- scripts/upgrade | 10 ++++++---- 15 files changed, 54 insertions(+), 26 deletions(-) delete mode 100644 .gitignore create mode 100644 doc/DESCRIPTION_fr.md create mode 100644 doc/DISCLAIMER.md create mode 100644 doc/DISCLAIMER_fr.md diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b25c15b..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/check_process b/check_process index 489a614..0db9b4f 100644 --- a/check_process +++ b/check_process @@ -11,6 +11,7 @@ setup_private=1 setup_public=1 upgrade=1 + # 2020.05.05~ynh4 upgrade=1 from_commit=bfdb624f86329cb5095cb3a343fc54e84d001c70 backup_restore=1 multi_instance=1 diff --git a/conf/app.src b/conf/app.src index 2a00faf..e316fcc 100644 --- a/conf/app.src +++ b/conf/app.src @@ -4,3 +4,4 @@ SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 21110f5..106c5fb 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,3 +1,7 @@ -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 +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! diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..ac63989 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,7 @@ +HEXTRIS est un jeu de puzzle au rythme rapide inspiré de Tetris. +Les blocs commencent sur les bords de l'écran, et tombent vers l'hexagone bleu intérieur. +Le but du jeu est d'empêcher les blocs de s'empiler en dehors de la zone de l'hexagone gris. +Pour ce faire, vous devez faire tourner l'hexagone pour gérer différentes piles de blocs sur chaque face. +Visez à relier 3 blocs ou plus de la même couleur : lorsque 3 blocs ou plus de la même couleur se touchent, ils sont détruits, et les blocs au-dessus d'eux glissent vers le bas ! +Détruire plusieurs séries de blocs permet d'obtenir des combos, dont la durée est indiquée par un contour qui s'estompe rapidement autour de l'hexagone extérieur gris. +Vous perdez une fois les blocs sur une face de la pile hexagonale en dehors de l'hexagone extérieur ! diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..e69de29 diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100644 index 0000000..e69de29 diff --git a/manifest.json b/manifest.json index f42e19d..f66079d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Fast paced puzzle game", "fr": "Jeu de puzzle très rapide" }, - "version": "2020.05.05~ynh4", + "version": "2020.05.05~ynh5", "url": "http://hextris.github.io/", "upstream": { "license": "GPL-3.0", @@ -27,7 +27,7 @@ "nginx" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" diff --git a/scripts/_common.sh b/scripts/_common.sh index f1a0166..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,4 +15,3 @@ #================================================= # FUTURE OFFICIAL HELPERS #================================================= - diff --git a/scripts/backup b/scripts/backup index 87e89d3..aaefe2e 100755 --- a/scripts/backup +++ b/scripts/backup @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -14,13 +14,16 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + true +} # Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_print_info --message="Loading installation settings..." +ynh_print_info --message="Loading settings..." app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/change_url b/scripts/change_url index 2480b7f..6328f58 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,13 +24,13 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_script_progression --message="Loading settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 diff --git a/scripts/install b/scripts/install index 330c567..13e6a6f 100755 --- a/scripts/install +++ b/scripts/install @@ -13,6 +13,9 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + true +} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -45,6 +48,8 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url +#================================================= +# STANDARD MODIFICATIONS #================================================= # CREATE DEDICATED USER #================================================= @@ -53,8 +58,6 @@ ynh_script_progression --message="Configuring system user..." --weight=1 # Create a system user ynh_system_user_create --username=$app --home_dir="$final_path" -#================================================= -# STANDARD MODIFICATIONS #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -76,6 +79,8 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config +#================================================= +# GENERIC FINALIZATION #================================================= # SETUP SSOWAT #================================================= @@ -84,6 +89,8 @@ ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] then + # Everyone can access the app. + # The "main" permission is automatically created before the install script. ynh_permission_update --permission="main" --add="visitors" fi diff --git a/scripts/remove b/scripts/remove index 9279214..29edd33 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_script_progression --message="Loading settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/restore b/scripts/restore index b4c4d93..27da975 100755 --- a/scripts/restore +++ b/scripts/restore @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -14,6 +14,9 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + true +} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -38,13 +41,6 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -64,6 +60,15 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# SPECIFIC RESTORATION +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c1c02aa..bc95775 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_script_progression --message="Loading settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -34,12 +34,14 @@ ynh_script_progression --message="Backing up the app before upgrading (may take # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { - # restore it if the upgrade fails + # Restore it if the upgrade fails ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# STANDARD UPGRADE STEPS #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -66,8 +68,6 @@ ynh_script_progression --message="Making sure dedicated system user exists..." - # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" -#================================================= -# STANDARD UPGRADE STEPS #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -92,6 +92,8 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config +#================================================= +# GENERIC FINALIZATION #================================================= # RELOAD NGINX #================================================= From 707c95f03a10a4cb7b97798963797c3b83dc8cc4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 16 Oct 2022 19:36:53 +0000 Subject: [PATCH 07/13] Auto-update README --- README.md | 11 ++++++++--- README_fr.md | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 943be27..1e9b574 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,16 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -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! -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 +**Shipped version:** 2020.05.05~ynh5 **Demo:** https://hextris.io/ diff --git a/README_fr.md b/README_fr.md index daba555..f528f84 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,11 +15,16 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Rotate the Hexagon to prevent the blocks from stacking outside the outer grey hexagon! +HEXTRIS est un jeu de puzzle au rythme rapide inspiré de Tetris. +Les blocs commencent sur les bords de l'écran, et tombent vers l'hexagone bleu intérieur. +Le but du jeu est d'empêcher les blocs de s'empiler en dehors de la zone de l'hexagone gris. +Pour ce faire, vous devez faire tourner l'hexagone pour gérer différentes piles de blocs sur chaque face. +Visez à relier 3 blocs ou plus de la même couleur : lorsque 3 blocs ou plus de la même couleur se touchent, ils sont détruits, et les blocs au-dessus d'eux glissent vers le bas ! +Détruire plusieurs séries de blocs permet d'obtenir des combos, dont la durée est indiquée par un contour qui s'estompe rapidement autour de l'hexagone extérieur gris. +Vous perdez une fois les blocs sur une face de la pile hexagonale en dehors de l'hexagone extérieur ! -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 +**Version incluse :** 2020.05.05~ynh5 **Démo :** https://hextris.io/ From 400cd850b96b04bf67ed77cd2429a9430a7b8d44 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 8 Jun 2023 14:32:42 +0000 Subject: [PATCH 08/13] Auto-update README --- README.md | 3 ++- README_fr.md | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 1e9b574..fc7ce05 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Hextris for YunoHost -[![Integration level](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![Working status](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![Working status](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) + [![Install Hextris with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hextris) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index f528f84..1d03643 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # Hextris pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![Statut de maintenance](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)* -> *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.* +> *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 +## Vue d’ensemble HEXTRIS est un jeu de puzzle au rythme rapide inspiré de Tetris. Les blocs commencent sur les bords de l'écran, et tombent vers l'hexagone bleu intérieur. @@ -28,14 +29,14 @@ Vous perdez une fois les blocs sur une face de la pile hexagonale en dehors de l **Démo :** https://hextris.io/ -## Captures d'écran +## Captures d’écran -![Capture d'écran de Hextris](./doc/screenshots/screenshot.jpg) +![Capture d’écran de Hextris](./doc/screenshots/screenshot.jpg) ## Documentations et ressources -* Site officiel de l'app : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -51,4 +52,4 @@ 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 :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 2f1b456c92c2104a7e23a177ea67c786b37d26fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 8 Jun 2023 17:00:40 +0200 Subject: [PATCH 09/13] Version 2 (#40) * v2 * v2 * Auto-update README * Update manifest.toml --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- check_process | 25 ------------- conf/app.src | 7 ---- conf/nginx.conf | 2 +- doc/DISCLAIMER.md | 0 doc/DISCLAIMER_fr.md | 0 manifest.json | 52 --------------------------- manifest.toml | 52 +++++++++++++++++++++++++++ scripts/backup | 22 +----------- scripts/change_url | 86 +------------------------------------------- scripts/install | 79 ++-------------------------------------- scripts/remove | 30 ---------------- scripts/restore | 46 ++---------------------- scripts/upgrade | 69 ++--------------------------------- tests.toml | 9 +++++ 16 files changed, 75 insertions(+), 408 deletions(-) delete mode 100644 check_process delete mode 100644 conf/app.src delete mode 100644 doc/DISCLAIMER.md delete mode 100644 doc/DISCLAIMER_fr.md delete mode 100644 manifest.json create mode 100644 manifest.toml create mode 100644 tests.toml diff --git a/README.md b/README.md index fc7ce05..c36544d 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Destroying multiple series of blocks grants combos, whose durations are indicate You lose once blocks on a face of the hexagon stack outside of the outer hexagon! -**Shipped version:** 2020.05.05~ynh5 +**Shipped version:** 2023.06.08~ynh1 **Demo:** https://hextris.io/ diff --git a/README_fr.md b/README_fr.md index 1d03643..4bed66b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ Détruire plusieurs séries de blocs permet d'obtenir des combos, dont la durée Vous perdez une fois les blocs sur une face de la pile hexagonale en dehors de l'hexagone extérieur ! -**Version incluse :** 2020.05.05~ynh5 +**Version incluse :** 2023.06.08~ynh1 **Démo :** https://hextris.io/ diff --git a/check_process b/check_process deleted file mode 100644 index 0db9b4f..0000000 --- a/check_process +++ /dev/null @@ -1,25 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - # 2020.05.05~ynh4 - upgrade=1 from_commit=bfdb624f86329cb5095cb3a343fc54e84d001c70 - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=bfdb624f86329cb5095cb3a343fc54e84d001c70 - name=1.1-ynh3 diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index e316fcc..0000000 --- a/conf/app.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/Hextris/hextris/archive/8872ec47d694628e2fe668ebaa90b13d5626d95f.tar.gz -SOURCE_SUM=67f3fbd54c405717a25fb1e6f71d2b46e94c7ac6971861dd99ae5e58f6609892 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 864573c..dcb54f1 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/; + alias __INSTALL_DIR__/; index index.html; diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md deleted file mode 100644 index e69de29..0000000 diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md deleted file mode 100644 index e69de29..0000000 diff --git a/manifest.json b/manifest.json deleted file mode 100644 index f66079d..0000000 --- a/manifest.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "Hextris", - "id": "hextris", - "packaging_format": 1, - "description": { - "en": "Fast paced puzzle game", - "fr": "Jeu de puzzle très rapide" - }, - "version": "2020.05.05~ynh5", - "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": ">= 11.0.9" - }, - "multi_instance": true, - "services": [ - "nginx" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/hextris", - "default": "/hextris" - }, - { - "name": "is_public", - "type": "boolean", - "help": { - "en": "If enabled, Hextris will be accessible by people who doesn't have an account. This can be changed later via the webadmin.", - "fr": "Si cette case est cochée, Hextris sera accessible aux personnes n'ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." - }, - "default": true - } - ] - } -} diff --git a/manifest.toml b/manifest.toml new file mode 100644 index 0000000..c82b170 --- /dev/null +++ b/manifest.toml @@ -0,0 +1,52 @@ +packaging_format = 2 + +id = "hextris" +name = "Hextris" +description.en = "Fast paced puzzle game" +description.fr = "Jeu de puzzle très rapide" + +version = "2023.06.08~ynh1" + +maintainers = ["AerisOne"] + +[upstream] +license = "GPL-3.0" +website = "http://hextris.github.io/" +demo = "https://hextris.io/" +code = "https://github.com/Hextris/Hextris" + +[integration] +yunohost = ">= 11.1.20" +architectures = "all" +multi_instance = true +ldap = false +sso = false +disk = "50M" +ram.build = "50M" +ram.runtime = "50M" + +[install] + [install.domain] + type = "domain" + + [install.path] + type = "path" + default = "/hextris" + + [install.init_main_permission] + type = "group" + default = "visitors" + +[resources] + [resources.sources.main] + url = "https://github.com/Hextris/hextris/archive/8872ec47d694628e2fe668ebaa90b13d5626d95f.tar.gz" + sha256 = "67f3fbd54c405717a25fb1e6f71d2b46e94c7ac6971861dd99ae5e58f6609892" + autoupdate.upstream = "https://github.com/Hextris/hextris" + autoupdate.strategy = "latest_github_commit" + + [resources.system_user] + + [resources.install_dir] + + [resources.permissions] + main.url = "/" diff --git a/scripts/backup b/scripts/backup index aaefe2e..52eea5b 100755 --- a/scripts/backup +++ b/scripts/backup @@ -10,26 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -ynh_clean_setup () { - true -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_print_info --message="Loading settings..." - -app=$YNH_APP_INSTANCE_NAME - -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -domain=$(ynh_app_setting_get --app=$app --key=domain) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= @@ -39,7 +19,7 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$final_path" +ynh_backup --src_path="$install_dir" #================================================= # BACKUP THE NGINX CONFIGURATION diff --git a/scripts/change_url b/scripts/change_url index 6328f58..16e0f3c 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,59 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH - -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading settings..." --weight=1 - -# Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. - ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - - # Restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -change_domain=0 -if [ "$old_domain" != "$new_domain" ] -then - change_domain=1 -fi - -change_path=0 -if [ "$old_path" != "$new_path" ] -then - change_path=1 -fi - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -69,38 +16,7 @@ fi #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf - -# Change the path in the NGINX config file -if [ $change_path -eq 1 ] -then - # Make a backup of the original NGINX config file if modified - ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" - # Create a dedicated NGINX config - ynh_add_nginx_config -fi - -# Change the domain for NGINX -if [ $change_domain -eq 1 ] -then - # Delete file checksum for the old conf file location - ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi - -#================================================= -# GENERIC FINALISATION -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload +ynh_change_url_nginx_config #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 13e6a6f..81a9208 100755 --- a/scripts/install +++ b/scripts/install @@ -9,67 +9,16 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -ynh_clean_setup () { - true -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= - -domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH -is_public=$YNH_APP_ARG_IS_PUBLIC - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS -#================================================= -ynh_script_progression --message="Validating installation parameters..." --weight=1 - -final_path=/var/www/$app -test ! -e "$final_path" || ynh_die --message="This path already contains a folder" - -# Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -ynh_script_progression --message="Storing installation settings..." --weight=2 - -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url - -#================================================= -# STANDARD MODIFICATIONS -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=1 - -# Create a system user -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" +ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # NGINX CONFIGURATION @@ -79,28 +28,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Configuring permissions..." --weight=1 - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. - ynh_permission_update --permission="main" --add="visitors" -fi - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index 29edd33..ffd1c65 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,26 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading settings..." --weight=1 - -app=$YNH_APP_INSTANCE_NAME - -domain=$(ynh_app_setting_get --app=$app --key=domain) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) - -#================================================= -# STANDARD REMOVE -#================================================= -# REMOVE APP MAIN DIR -#================================================= -ynh_script_progression --message="Removing app main directory..." --weight=1 - -# Remove the app directory securely -ynh_secure_remove --file="$final_path" - #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -37,16 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -ynh_script_progression --message="Removing the dedicated system user..." --weight=1 - -# Delete a system user -ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 27da975..95d2fd2 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,55 +10,15 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -ynh_clean_setup () { - true -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading settings..." --weight=2 - -app=$YNH_APP_INSTANCE_NAME - -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) - -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=1 - -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " - -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression --message="Restoring the app main directory..." --weight=1 -ynh_restore_file --origin_path="$final_path" +ynh_restore_file --origin_path="$install_dir" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index bc95775..201fdf1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,65 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading settings..." --weight=1 - -app=$YNH_APP_INSTANCE_NAME - -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) - #================================================= # CHECK VERSION #================================================= upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=5 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # Restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# If final_path doesn't exist, create it -if [ -z "$final_path" ]; then - final_path=/var/www/$app - ynh_app_setting_set --app=$app --key=final_path --value=$final_path -fi - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 - -# Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -77,12 +24,11 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$install_dir" fi -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # NGINX CONFIGURATION @@ -92,15 +38,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..21bc483 --- /dev/null +++ b/tests.toml @@ -0,0 +1,9 @@ +test_format = 1.0 + +[default] + + # ------------------------------- + # Commits to test upgrade from + # ------------------------------- + + test_upgrade_from.bfdb624f86329cb5095cb3a343fc54e84d001c70.name = "Upgrade from 2020.05.05~ynh4" From a4595fa2167ed83f2f311d92420d95c3b073528d Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Fri, 9 Jun 2023 21:42:33 +0200 Subject: [PATCH 10/13] Upgrade to v2022.02.08 (#42) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Upgrade to v2022.02.08 * Auto-update README * Update manifest.toml * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c36544d..3279edf 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Destroying multiple series of blocks grants combos, whose durations are indicate You lose once blocks on a face of the hexagon stack outside of the outer hexagon! -**Shipped version:** 2023.06.08~ynh1 +**Shipped version:** 2023.06.09~ynh1 **Demo:** https://hextris.io/ diff --git a/README_fr.md b/README_fr.md index 4bed66b..60e9aa5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ Détruire plusieurs séries de blocs permet d'obtenir des combos, dont la durée Vous perdez une fois les blocs sur une face de la pile hexagonale en dehors de l'hexagone extérieur ! -**Version incluse :** 2023.06.08~ynh1 +**Version incluse :** 2023.06.09~ynh1 **Démo :** https://hextris.io/ diff --git a/manifest.toml b/manifest.toml index c82b170..0fe3852 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Hextris" description.en = "Fast paced puzzle game" description.fr = "Jeu de puzzle très rapide" -version = "2023.06.08~ynh1" +version = "2023.06.09~ynh1" maintainers = ["AerisOne"] @@ -39,8 +39,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/Hextris/hextris/archive/8872ec47d694628e2fe668ebaa90b13d5626d95f.tar.gz" - sha256 = "67f3fbd54c405717a25fb1e6f71d2b46e94c7ac6971861dd99ae5e58f6609892" + url = "https://github.com/Hextris/hextris/archive/3f4847dc8fd7dab3d1c87e6324b9159d92fbd396.tar.gz" + sha256 = "38539c391cd97b1d90177c81b55a6194fd00e1b930bb21951d39b4902a4377ef" autoupdate.upstream = "https://github.com/Hextris/hextris" autoupdate.strategy = "latest_github_commit" From 8b4eecd5f8f4b1fe240dde0f885d06c136db8aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 9 Dec 2023 17:20:26 +0100 Subject: [PATCH 11/13] Update manifest.toml --- manifest.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0fe3852..253514c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,11 +16,14 @@ demo = "https://hextris.io/" code = "https://github.com/Hextris/Hextris" [integration] -yunohost = ">= 11.1.20" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" From 81e960a9031d875480383eb1b78d3e68f5934a5f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 9 Dec 2023 16:20:36 +0000 Subject: [PATCH 12/13] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3279edf..222e298 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ You lose once blocks on a face of the hexagon stack outside of the outer hexagon * Official app website: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 60e9aa5..7efcc9c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -37,7 +37,7 @@ Vous perdez une fois les blocs sur une face de la pile hexagonale en dehors de l * Site officiel de l’app : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From a092d302c8add9478ab5a85c3905582ebdacd402 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 20 Jun 2024 18:22:47 +0000 Subject: [PATCH 13/13] Auto-update READMEs --- ALL_README.md | 4 +++- README.md | 9 +------- README_es.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 11 ---------- README_zh_Hans.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 169 insertions(+), 20 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..152f2e7 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) +- [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) diff --git a/README.md b/README.md index a42fc6d..35e58b2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install Hextris with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hextris) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *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.* @@ -35,17 +35,10 @@ You lose once blocks on a face of the hexagon stack outside of the outer hexagon ## Documentation and resources -<<<<<<< HEAD -* Official app website: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: -======= - Official app website: - Upstream app code repository: - YunoHost Store: - Report a bug: ->>>>>>> master ## Developer info diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..24dea51 --- /dev/null +++ b/README_es.md @@ -0,0 +1,55 @@ + + +# Hextris para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) + +[![Instalar Hextris con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hextris) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarHextris 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 + +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! + + +**Versión actual:** 2023.06.09~ynh1 + +**Demo:** + +## Capturas + +![Captura de Hextris](./doc/screenshots/screenshot.jpg) + +## Documentaciones y recursos + +- Sitio web 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/hextris_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug +o +sudo yunohost app upgrade hextris -u https://github.com/YunoHost-Apps/hextris_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..27f1b15 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,55 @@ + + +# Hextris YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) + +[![Instalatu Hextris YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hextris) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Hextris YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +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! + + +**Paketatutako bertsioa:** 2023.06.09~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Hextris(r)en pantaila-argazkia](./doc/screenshots/screenshot.jpg) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/hextris_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug +edo +sudo yunohost app upgrade hextris -u https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 8f9984f..599f9e9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,11 +25,7 @@ Détruire plusieurs séries de blocs permet d'obtenir des combos, dont la durée Vous perdez une fois les blocs sur une face de la pile hexagonale en dehors de l'hexagone extérieur ! -<<<<<<< HEAD -**Version incluse :** 2023.06.09~ynh1 -======= **Version incluse :** 2023.06.09~ynh1 ->>>>>>> master **Démo :** @@ -39,17 +35,10 @@ Vous perdez une fois les blocs sur une face de la pile hexagonale en dehors de l ## Documentations et ressources -<<<<<<< HEAD -* Site officiel de l’app : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : -======= - Site officiel de l’app : - Dépôt de code officiel de l’app : - YunoHost Store : - Signaler un bug : ->>>>>>> master ## Informations pour les développeurs diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..1523748 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,55 @@ + + +# YunoHost 上的 Hextris + +[![集成程度](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) + +[![使用 YunoHost 安装 Hextris](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hextris) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Hextris。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +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! + + +**分发版本：** 2023.06.09~ynh1 + +**演示：** + +## 截图 + +![Hextris 的截图](./doc/screenshots/screenshot.jpg) + +## 文档与资源 + +- 官方应用网站： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/hextris_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug +或 +sudo yunohost app upgrade hextris -u https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：**