From c810fe78963fac81c24c2b83087934e41403b1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 21 Jun 2021 22:37:25 +0200 Subject: [PATCH 01/11] Fix (#19) --- check_process | 6 +++--- manifest.json | 2 +- scripts/install | 28 +++++++++++++++++----------- scripts/remove | 8 ++++++++ scripts/restore | 25 +++++++++++-------------- scripts/upgrade | 19 ++++++++++++------- 6 files changed, 52 insertions(+), 36 deletions(-) diff --git a/check_process b/check_process index 176d5a5..9f9d48d 100644 --- a/check_process +++ b/check_process @@ -1,9 +1,9 @@ ;; Test complet auto_remove=1 ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - is_public="Yes" (PUBLIC|public=Yes|private=No) + domain="domain.tld" + path="/path" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/manifest.json b/manifest.json index 0871e45..d93eb50 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.4" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index d64b57b..57050df 100755 --- a/scripts/install +++ b/scripts/install @@ -46,6 +46,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 #================================================= @@ -58,6 +66,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 #================================================= @@ -66,22 +78,16 @@ 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 -#================================================= - -# Set permissions to app files -chown -R root: $final_path - #================================================= # SETUP SSOWAT #================================================= ynh_script_progression --message="Configuring permissions..." --weight=1 -# Make app public if necessary or protect it -[ $is_public -eq 0 ] || ynh_permission_update --permission="main" --add="visitors" +# Make app public if necessary +if [ $is_public -eq 1 ] +then + ynh_permission_update --permission="main" --add="visitors" +fi #================================================= # RELOAD NGINX diff --git a/scripts/remove b/scripts/remove index 7abebbf..583768c 100755 --- a/scripts/remove +++ b/scripts/remove @@ -36,6 +36,14 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config +#================================================= +# 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 26a7378..2d136fe 100644 --- a/scripts/restore +++ b/scripts/restore @@ -43,6 +43,14 @@ test ! -d $final_path \ 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 #================================================= @@ -50,20 +58,9 @@ ynh_script_progression --message="Restoring Cubiks 2048 main directory..." --wei ynh_restore_file --origin_path="$final_path" -#================================================= -# 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 - -#================================================= -# RESTORE USER RIGHTS -#================================================= - -# Restore permissions on app files -chown -R root: $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 2ef3a47..c06a383 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,6 +57,14 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# 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 #================================================= @@ -69,6 +77,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 #================================================= @@ -77,13 +89,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions on app files -chown -R root: $final_path - #================================================= # RELOAD NGINX #================================================= From 4fb3998b1f0baea3db33430fcd05bc4dc872275f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 11 Dec 2021 22:57:15 +0100 Subject: [PATCH 02/11] 4.3 --- conf/nginx.conf | 5 ----- manifest.json | 5 ++--- scripts/restore | 5 +---- scripts/upgrade | 28 ++++++++++++++-------------- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 052c370..508fc0a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } diff --git a/manifest.json b/manifest.json index d93eb50..a159f99 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -24,8 +24,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", diff --git a/scripts/restore b/scripts/restore index 2d136fe..ad9ffc7 100644 --- a/scripts/restore +++ b/scripts/restore @@ -30,10 +30,7 @@ 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 " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS diff --git a/scripts/upgrade b/scripts/upgrade index c06a383..00c97c0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,6 +25,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 Cubiks 2048 before upgrading (may take a while)..." --weight=3 + +# 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 #================================================= @@ -43,20 +57,6 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up Cubiks 2048 before upgrading (may take a while)..." --weight=3 - -# 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 DEDICATED USER #================================================= From 8264f48b2e3160d4c0c0069fad4526d2af76782d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 19 Dec 2022 12:28:51 +0100 Subject: [PATCH 03/11] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a159f99..692ae9e 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ From 6b4cc1380f4c9ee10d864a725ce68143e155d5be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 19 Dec 2022 18:46:27 +0100 Subject: [PATCH 04/11] Fix minter --- doc/DESCRIPTION.md | 1 + manifest.json | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 doc/DESCRIPTION.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..48a53f1 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Create the number 2048. Cubes with same number merge! \ No newline at end of file diff --git a/manifest.json b/manifest.json index 692ae9e..5cd08f4 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,12 @@ }, "version": "1.0~ynh5", "url": "https://github.com/Kshitij-Banerjee/Cubiks-2048/", + "upstream": { + "license": "MIT", + "website": "https://kshitij-banerjee.github.io/Cubiks-2048/", + "demo": "https://kshitij-banerjee.github.io/Cubiks-2048/", + "code": "https://github.com/Kshitij-Banerjee/Cubiks-2048/" + }, "license": "MIT", "maintainer": { "name": "eric_G", From 8c5cd2154fa4c3013b800211728f0d805f17385f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 19 Dec 2022 17:46:32 +0000 Subject: [PATCH 05/11] Auto-update README --- README.md | 52 +++++++++++++++++++++++++++++----------------------- README_fr.md | 52 +++++++++++++++++++++++++++++----------------------- 2 files changed, 58 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index 231d500..1c738f6 100644 --- a/README.md +++ b/README.md @@ -1,45 +1,51 @@ + + # Cubiks 2048 for YunoHost -[![Integration level](https://dash.yunohost.org/integration/cubiks-2048.svg)](https://dash.yunohost.org/appci/app/cubiks-2048) ![](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/cubiks-2048.svg)](https://dash.yunohost.org/appci/app/cubiks-2048) ![Working status](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.maintain.svg) [![Install Cubiks 2048 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cubiks-2048) *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install Cubiks 2048 quickly and simply on a YunoHost server. -If you don’t have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.* +> *This package allows you to install Cubiks 2048 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 -Clone of 2048 game in 3D +Create the number 2048. Cubes with same number merge! + +**Shipped version:** 1.0~ynh5 + +**Demo:** https://kshitij-banerjee.github.io/Cubiks-2048/ ## Screenshots -![](Screenshot-Cubiks-2048.jpg) +![Screenshot of Cubiks 2048](./doc/screenshots/Screenshot-Cubiks-2048.jpg) -## Demo +## :red_circle: Antifeatures -* [Official demo](https://kshitij-banerjee.github.io/Cubiks-2048/) +- **Tracking**: Tracks you and/or reports your activity to upstream maintainer or third parties, either without your permission or by default. -#### Supported architectures +## Documentation and resources -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/cubiks-2048.svg)](https://ci-apps.yunohost.org/ci/apps/cubiks-2048/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/cubiks-2048.svg)](https://ci-apps-arm.yunohost.org/ci/apps/cubiks-2048/) +* Official app website: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: -## Links +## Developer info - * Report a bug: https://github.com/YunoHost-Apps/Cubiks-2048_ynh/issues - * Upstream app repository: https://github.com/Kshitij-Banerjee/Cubiks-2048 - * YunoHost website: https://yunohost.org/ - ---- - -## Developers info - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/Cubiks-2048_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/cubiks-2048_ynh/tree/testing). To try the testing branch, please proceed like that. -``` -sudo yunohost app install https://github.com/YunoHost-Apps/Cubiks-2048_ynh/tree/testing --debug + +``` bash +sudo yunohost app install https://github.com/YunoHost-Apps/cubiks-2048_ynh/tree/testing --debug or -sudo yunohost app upgrade cubiks-2048 -u https://github.com/YunoHost-Apps/Cubiks-2048_ynh/tree/testing --debug +sudo yunohost app upgrade cubiks-2048 -u https://github.com/YunoHost-Apps/cubiks-2048_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 1392cb1..76b9ec1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,45 +1,51 @@ + + # Cubiks 2048 pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/cubiks-2048.svg)](https://dash.yunohost.org/appci/app/cubiks-2048) ![](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/cubiks-2048.svg)](https://dash.yunohost.org/appci/app/cubiks-2048) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.maintain.svg) [![Installer Cubiks 2048 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cubiks-2048) -*[Read this readme in english.](./README.md)* +*[Read this readme in english.](./README.md)* -> *This package allow you to install Cubiks 2048 quickly and simply on a YunoHost server. -If you don’t have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.* +> *Ce package vous permet d'installer Cubiks 2048 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 -Clone en 3D du jeu 2048. +Create the number 2048. Cubes with same number merge! -## Captures d’écran +**Version incluse :** 1.0~ynh5 -![](Screenshot-Cubiks-2048.jpg) +**Démo :** https://kshitij-banerjee.github.io/Cubiks-2048/ -## Démo +## Captures d'écran -* [Démo officielle](https://kshitij-banerjee.github.io/Cubiks-2048/) +![Capture d'écran de Cubiks 2048](./doc/screenshots/Screenshot-Cubiks-2048.jpg) -#### Architectures supportées +## :red_circle: Fonctions indésirables -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/cubiks-2048.svg)](https://ci-apps.yunohost.org/ci/apps/cubiks-2048/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/cubiks-2048.svg)](https://ci-apps-arm.yunohost.org/ci/apps/cubiks-2048/) +- **Tracking**: Tracks you and/or reports your activity to upstream maintainer or third parties, either without your permission or by default. -## Liens +## Documentations et ressources - * Signaler un bug : https://github.com/YunoHost-Apps/Cubiks-2048_ynh/issues - * Dépôt de l’application principale : https://github.com/Kshitij-Banerjee/Cubiks-2048 - * Site web YunoHost : https://yunohost.org/ - ---- +* 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/Cubiks-2048_ynh/tree/testing). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/cubiks-2048_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` -sudo yunohost app install https://github.com/YunoHost-Apps/Cubiks-2048_ynh/tree/testing --debug + +``` bash +sudo yunohost app install https://github.com/YunoHost-Apps/cubiks-2048_ynh/tree/testing --debug ou -sudo yunohost app upgrade cubiks-2048 -u https://github.com/YunoHost-Apps/Cubiks-2048_ynh/tree/testing --debug +sudo yunohost app upgrade cubiks-2048 -u https://github.com/YunoHost-Apps/cubiks-2048_ynh/tree/testing --debug ``` + +**Plus d'infos sur le packaging d'applications :** From 39a320e6f0eedb56e50d553bd44ad35aef7bd2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 19 Dec 2022 18:46:41 +0100 Subject: [PATCH 06/11] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 5cd08f4..f239ae4 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "2048 game clone in 3D", "fr": "Clone du jeu 2048 en 3D" }, - "version": "1.0~ynh5", + "version": "1.0~ynh6", "url": "https://github.com/Kshitij-Banerjee/Cubiks-2048/", "upstream": { "license": "MIT", From eb60b90e50f477d8dd6af1ccd5d670e53f9db55f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 19 Dec 2022 17:46:53 +0000 Subject: [PATCH 07/11] 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 1c738f6..bb00c1c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Create the number 2048. Cubes with same number merge! -**Shipped version:** 1.0~ynh5 +**Shipped version:** 1.0~ynh6 **Demo:** https://kshitij-banerjee.github.io/Cubiks-2048/ diff --git a/README_fr.md b/README_fr.md index 76b9ec1..de31855 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Create the number 2048. Cubes with same number merge! -**Version incluse :** 1.0~ynh5 +**Version incluse :** 1.0~ynh6 **Démo :** https://kshitij-banerjee.github.io/Cubiks-2048/ From 924895ef3c3d7b7fd5ea5128f4ae5cdcdb3700a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Apr 2023 16:36:48 +0200 Subject: [PATCH 08/11] Version 2 (#24) * v2 * Auto-update README * v2 * Create tests.toml --------- Co-authored-by: yunohost-bot --- README.md | 3 +- README_fr.md | 19 +++++----- check_process | 19 ---------- conf/app.src | 6 ---- conf/nginx.conf | 2 +- manifest.json | 52 --------------------------- manifest.toml | 52 +++++++++++++++++++++++++++ scripts/backup | 19 +--------- scripts/change_url | 87 +--------------------------------------------- scripts/install | 73 ++------------------------------------ scripts/remove | 28 --------------- scripts/restore | 56 +++++++---------------------- scripts/upgrade | 65 ++-------------------------------- tests.toml | 3 ++ 14 files changed, 88 insertions(+), 396 deletions(-) delete mode 100644 check_process delete mode 100644 conf/app.src delete mode 100644 manifest.json create mode 100644 manifest.toml create mode 100644 tests.toml diff --git a/README.md b/README.md index bb00c1c..3d7c2eb 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Cubiks 2048 for YunoHost -[![Integration level](https://dash.yunohost.org/integration/cubiks-2048.svg)](https://dash.yunohost.org/appci/app/cubiks-2048) ![Working status](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/cubiks-2048.svg)](https://dash.yunohost.org/appci/app/cubiks-2048) ![Working status](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.maintain.svg) + [![Install Cubiks 2048 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cubiks-2048) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index de31855..8ba4803 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # Cubiks 2048 pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/cubiks-2048.svg)](https://dash.yunohost.org/appci/app/cubiks-2048) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/cubiks-2048.svg)](https://dash.yunohost.org/appci/app/cubiks-2048) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/cubiks-2048.maintain.svg) + [![Installer Cubiks 2048 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cubiks-2048) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Cubiks 2048 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 Cubiks 2048 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 Create the number 2048. Cubes with same number merge! @@ -21,9 +22,9 @@ Create the number 2048. Cubes with same number merge! **Démo :** https://kshitij-banerjee.github.io/Cubiks-2048/ -## Captures d'écran +## Captures d’écran -![Capture d'écran de Cubiks 2048](./doc/screenshots/Screenshot-Cubiks-2048.jpg) +![Capture d’écran de Cubiks 2048](./doc/screenshots/Screenshot-Cubiks-2048.jpg) ## :red_circle: Fonctions indésirables @@ -31,8 +32,8 @@ Create the number 2048. Cubes with same number merge! ## 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 : @@ -48,4 +49,4 @@ ou sudo yunohost app upgrade cubiks-2048 -u https://github.com/YunoHost-Apps/cubiks-2048_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 diff --git a/check_process b/check_process deleted file mode 100644 index 9f9d48d..0000000 --- a/check_process +++ /dev/null @@ -1,19 +0,0 @@ -;; Test complet - auto_remove=1 - ; 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 - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 - \ No newline at end of file diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 243feda..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/Kshitij-Banerjee/Cubiks-2048/archive/master.tar.gz -SOURCE_SUM=8b45de903449a9b47202cc28d9b20091cab9283634cd655d3fb7b8a65aaf2e91 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=Cubiks-2048-master.tar.gz \ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index 508fc0a..7937e6b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/ ; + alias __INSTALL_DIR__/; # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/manifest.json b/manifest.json deleted file mode 100644 index f239ae4..0000000 --- a/manifest.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "Cubiks 2048", - "id": "cubiks-2048", - "packaging_format": 1, - "description": { - "en": "2048 game clone in 3D", - "fr": "Clone du jeu 2048 en 3D" - }, - "version": "1.0~ynh6", - "url": "https://github.com/Kshitij-Banerjee/Cubiks-2048/", - "upstream": { - "license": "MIT", - "website": "https://kshitij-banerjee.github.io/Cubiks-2048/", - "demo": "https://kshitij-banerjee.github.io/Cubiks-2048/", - "code": "https://github.com/Kshitij-Banerjee/Cubiks-2048/" - }, - "license": "MIT", - "maintainer": { - "name": "eric_G", - "email": "" - }, - "requirements": { - "yunohost": ">= 11.0.9" - }, - "multi_instance": true, - "services": [ - "nginx" - ], - "arguments": { - "install" : [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/cubiks-2048", - "default": "/cubiks-2048" - }, - { - "name": "is_public", - "type": "boolean", - "help": { - "en": "If enabled, Cubiks 2048 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, Cubiks 2048 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..ea1c56a --- /dev/null +++ b/manifest.toml @@ -0,0 +1,52 @@ +packaging_format = 2 + +id = "cubiks-2048" +name = "Cubiks 2048" +description.en = "2048 game clone in 3D" +description.fr = "Clone du jeu 2048 en 3D" + +version = "1.0~ynh6" + +maintainers = ["eric_G"] + +[upstream] +license = "MIT" +website = "https://kshitij-banerjee.github.io/Cubiks-2048/" +demo = "https://kshitij-banerjee.github.io/Cubiks-2048/" +code = "https://github.com/Kshitij-Banerjee/Cubiks-2048/" + +[integration] +yunohost = ">= 11.1.16" +architectures = "all" +multi_instance = true +ldap = false +sso = true +disk = "50M" +ram.build = "50M" +ram.runtime = "50M" + +[install] + [install.domain] + type = "domain" + + [install.path] + type = "path" + default = "/cubiks-2048" + + [install.init_main_permission] + help.en = "If enabled, Cubiks 2048 will be accessible by people who doesn’t have an account. This can be changed later via the webadmin." + help.fr = "Si cette case est cochée, Cubiks 2048 sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + type = "group" + default = "visitors" + +[resources] + [resources.sources.main] + url = "https://github.com/Kshitij-Banerjee/Cubiks-2048/archive/master.tar.gz" + sha256 = "8b45de903449a9b47202cc28d9b20091cab9283634cd655d3fb7b8a65aaf2e91" + + [resources.system_user] + + [resources.install_dir] + + [resources.permissions] + main.url = "/" diff --git a/scripts/backup b/scripts/backup index cdfe3bf..40bee17 100644 --- a/scripts/backup +++ b/scripts/backup @@ -8,23 +8,6 @@ source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_print_info --message="Backing up Cubiks 2048..." - -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 #================================================= @@ -34,7 +17,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 424dd66..86b6b3d 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -8,97 +8,12 @@ source /usr/share/yunohost/helpers -# Stop script if errors -ynh_abort_if_errors - -#================================================= -# 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 installation 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 -#================================================= -ynh_script_progression --message="Backing up Cubiks 2048 before changing its URL (may take a while)..." --weight=2 - -# 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 - #================================================= # MODIFY URL IN NGINX CONF #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=3 -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 - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=2 - -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 57050df..3ca628b 100755 --- a/scripts/install +++ b/scripts/install @@ -8,52 +8,6 @@ source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= -# Retrieve arguments - -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 - -# Copy files to the right place -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 - -#================================================= -# 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 #================================================= @@ -61,14 +15,11 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= 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 @@ -78,24 +29,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Configuring permissions..." --weight=1 - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - 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 583768c..8323307 100755 --- a/scripts/remove +++ b/scripts/remove @@ -8,26 +8,6 @@ source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation 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 Cubiks 2048 main directory..." --weight=3 - -# Remove the app directory securely -ynh_secure_remove --file="$final_path" - #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -36,14 +16,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# 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 ad9ffc7..45ea7bd 100644 --- a/scripts/restore +++ b/scripts/restore @@ -8,56 +8,24 @@ source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -ynh_abort_if_errors - -#================================================= -# 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 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 -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= - -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 #================================================= ynh_script_progression --message="Restoring Cubiks 2048 main directory..." --weight=2 -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" + +#================================================= +# RESTORE SYSTEM CONFIGURATIONS +#================================================= +# RESTORE THE PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring system configurations related to $app..." --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 00c97c0..f7b4a41 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -8,63 +8,12 @@ source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation 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 Cubiks 2048 before upgrading (may take a while)..." --weight=3 - -# 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 -#================================================= -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 #================================================= @@ -74,12 +23,11 @@ then ynh_script_progression --message="Upgrading source files..." --weight=4 # 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 @@ -89,13 +37,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# 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..cbbeef1 --- /dev/null +++ b/tests.toml @@ -0,0 +1,3 @@ +test_format = 1.0 + +[default] From e103a36fd91abaef4bccb96f76574375ba9b885f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Apr 2023 14:38:12 +0000 Subject: [PATCH 09/11] Auto-update README --- README_fr.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README_fr.md b/README_fr.md index 728b440..8ba4803 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ It shall NOT be edited by hand. > *Ce package vous permet d’installer Cubiks 2048 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 Create the number 2048. Cubes with same number merge! @@ -22,7 +22,7 @@ Create the number 2048. Cubes with same number merge! **Démo :** https://kshitij-banerjee.github.io/Cubiks-2048/ -**Version incluse :** 1.0~ynh6 +## Captures d’écran ![Capture d’écran de Cubiks 2048](./doc/screenshots/Screenshot-Cubiks-2048.jpg) @@ -49,4 +49,4 @@ ou sudo yunohost app upgrade cubiks-2048 -u https://github.com/YunoHost-Apps/cubiks-2048_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 cd458754fbf340234ca2b4036621ed901e72972a Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 20 Feb 2024 05:05:26 +0100 Subject: [PATCH 10/11] autoupdate.strategy = "latest_github_commit" --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index ea1c56a..a2427e4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,6 +43,7 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/Kshitij-Banerjee/Cubiks-2048/archive/master.tar.gz" sha256 = "8b45de903449a9b47202cc28d9b20091cab9283634cd655d3fb7b8a65aaf2e91" + autoupdate.strategy = "latest_github_commit" [resources.system_user] From 4a9120092f8ecc7ec95db5461ec4006a8dc1f75f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 20 Feb 2024 04:05:30 +0000 Subject: [PATCH 11/11] Auto-update README --- README.md | 6 +++--- README_fr.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3d7c2eb..9501f4e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -34,7 +34,7 @@ Create the number 2048. Cubes with same number merge! * Official app website: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info @@ -49,4 +49,4 @@ or sudo yunohost app upgrade cubiks-2048 -u https://github.com/YunoHost-Apps/cubiks-2048_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 8ba4803..b2d4f70 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -34,7 +34,7 @@ Create the number 2048. Cubes with same number merge! * 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