From 71ad74699e7d012a264961c1b8656050c646f029 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Fri, 14 May 2021 09:14:07 +0200 Subject: [PATCH 1/4] Update issue and PR templates Co-authored-by: Yunohost-Bot --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ pull_request_template.md | 16 ---------- 3 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 pull_request_template.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 6c28fc5..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* From e826b85ff84d495e1051cdcafa393810eed5e488 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 8 Sep 2021 09:02:49 +0200 Subject: [PATCH 2/4] 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 3/4] 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 From df059a9b75c2bdc16d2ea0ac8c897413e7b44622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 Sep 2021 23:53:24 +0200 Subject: [PATCH 4/4] Set rights (#33) --- scripts/install | 22 ++++++++++++---------- scripts/remove | 10 ++++++++++ scripts/restore | 14 ++++++++++++-- scripts/upgrade | 41 ++++++++++++++++++++++------------------- 4 files changed, 56 insertions(+), 31 deletions(-) diff --git a/scripts/install b/scripts/install index d17e38f..330c567 100755 --- a/scripts/install +++ b/scripts/install @@ -45,6 +45,14 @@ 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 +#================================================= +# 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" + #================================================= # STANDARD MODIFICATIONS #================================================= @@ -56,6 +64,10 @@ 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" +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -64,16 +76,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= -ynh_script_progression --message="Securing files and directories..." --weight=1 - -# Set permissions to app files -chown -R root: $final_path - #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/remove b/scripts/remove index 5a76e4b..9279214 100755 --- a/scripts/remove +++ b/scripts/remove @@ -37,6 +37,16 @@ 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 69d98c5..b4c4d93 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 " @@ -47,6 +45,14 @@ ynh_script_progression --message="Restoring the NGINX configuration..." --weight ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# 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 #================================================= @@ -54,6 +60,10 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$final_path" +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8e535ce..c1c02aa 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,6 +26,20 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) 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 + #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -45,18 +59,12 @@ if ynh_legacy_permissions_exists; then fi #================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +# CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=5 +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 -# 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 +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # STANDARD UPGRADE STEPS @@ -72,6 +80,10 @@ then ynh_setup_source --dest_dir="$final_path" fi +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -80,15 +92,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions on app files -chown -R root: $final_path - #================================================= # RELOAD NGINX #=================================================