YunoHost-Apps · ericgaspar · Mar 23, 2023 · Dec 26, 2020 · Dec 26, 2020 · Dec 26, 2020
diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fetch the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run the updater script
@@ -33,7 +33,7 @@ jobs:
       - name: Create Pull Request
         id: cpr
         if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Update to version ${{ env.VERSION }}

diff --git a/README.md b/README.md
@@ -5,7 +5,8 @@ It shall NOT be edited by hand.
 
 # Grocy for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/grocy.svg)](https://dash.yunohost.org/appci/app/grocy) ![Working status](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/grocy.svg)](https://dash.yunohost.org/appci/app/grocy) ![Working status](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg)
+
 [![Install Grocy with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grocy)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -17,28 +18,14 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 grocy is a web-based self-hosted groceries & household management solution for your home.
 
-**Shipped version:** 3.3.2~ynh2
+**Shipped version:** 3.3.2~ynh3
 
 **Demo:** https://en.demo.grocy.info/stockoverview
 
 ## Screenshots
 
 ![Screenshot of Grocy](./doc/screenshots/stock-en.png)
 
-## Disclaimers / important information
-
-## Configuration
-
- Default login
-```
-	user: admin
-	password: admin
-```
-
-## Limitations
-
-:warning: For now, Grocy must be installed in a root domain or subdirectory.
-
 ## Documentation and resources
 
 * Official app website: <https://grocy.info/>

diff --git a/README_fr.md b/README_fr.md
@@ -5,44 +5,31 @@ It shall NOT be edited by hand.
 
 # Grocy pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/grocy.svg)](https://dash.yunohost.org/appci/app/grocy) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg)  
+[![Niveau d’intégration](https://dash.yunohost.org/integration/grocy.svg)](https://dash.yunohost.org/appci/app/grocy) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/grocy.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/grocy.maintain.svg)
+
 [![Installer Grocy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grocy)
 
 *[Read this readme in english.](./README.md)*
 
-> *Ce package vous permet d'installer Grocy 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 Grocy 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
 
 grocy is a web-based self-hosted groceries & household management solution for your home.
 
-**Version incluse :** 3.3.2~ynh2
+**Version incluse :** 3.3.2~ynh3
 
 **Démo :** https://en.demo.grocy.info/stockoverview
 
-## Captures d'écran
-
-![Capture d'écran de Grocy](./doc/screenshots/stock-en.png)
-
-## Avertissements / informations importantes
-
-## Configuration
-
-Connexion par défaut
-```
-	utilisateur : admin
-	mot de passe : admin
-```
-
-## Limitations
+## Captures d’écran
 
-:warning: Pour l'instant, Grocy doit être installé dans un domaine racine ou un sous-domaine.
+![Capture d’écran de Grocy](./doc/screenshots/stock-en.png)
 
 ## Documentations et ressources
 
-* Site officiel de l'app : <https://grocy.info/>
-* Dépôt de code officiel de l'app : <https://github.com/grocy/grocy>
+* Site officiel de l’app : <https://grocy.info/>
+* Dépôt de code officiel de l’app : <https://github.com/grocy/grocy>
 * Documentation YunoHost pour cette app : <https://yunohost.org/app_grocy>
 * Signaler un bug : <https://github.com/YunoHost-Apps/grocy_ynh/issues>
 
@@ -58,4 +45,4 @@ ou
 sudo yunohost app upgrade grocy -u https://github.com/YunoHost-Apps/grocy_ynh/tree/testing --debug
 ```
 
-**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
diff --git a/check_process b/check_process
diff --git a/conf/app.src b/conf/app.src
diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -2,7 +2,7 @@
 location __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/public/;
+  alias __INSTALL_DIR__/public/;
 
   index index.php;
 

diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md
@@ -0,0 +1,6 @@
+Default login
+
+```
+	user: admin
+	password: admin
+```
diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md
@@ -0,0 +1,5 @@
+Connexion par défaut
+```
+	utilisateur : admin
+	mot de passe : admin
+```
diff --git a/manifest.json b/manifest.json
diff --git a/manifest.toml b/manifest.toml
@@ -0,0 +1,57 @@
+packaging_format = 2
+
+id = "grocy"
+name = "Grocy"
+description.en = "Web-based groceries & household management solution for your home"
+description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison"
+
+version = "3.3.2~ynh3"
+
+maintainers = ["eric_G"]
+
+[upstream]
+license = "MIT"
+website = "https://grocy.info/"
+demo = "https://en.demo.grocy.info/stockoverview"
+code = "https://github.com/grocy/grocy"
+
+[integration]
+yunohost = ">= 11.1.15"
+architectures = "all"
+multi_instance = true
+ldap =  true
+sso = false
+disk = "50M"
+ram.build = "50M"
+ram.runtime = "50M"
+[install]
+    [install.domain]
+    type = "domain"
+    full_domain = true
+
+    [install.language]
+    ask.en = "Choose the application language"
+    ask.fr = "Choisissez la langue de l'application"
+    type = "string"
+    choices = ["de", "en", "es", "fr", "it", "pt"]
+    default = "fr"
+
+    [install.init_main_permission]
+    type = "group"
+    default = "visitors"
+
+[resources]
+        [resources.sources.main]
+        url = "https://github.com/grocy/grocy/releases/download/v3.3.2/grocy_3.3.2.zip"
+        sha256 = "285e33c6b0bcae545468129ce222c8b7a4d2007309fad396a6d32c55c8b1556b"
+        in_subdir = false
+
+    [resources.system_user]
+
+    [resources.install_dir]
+
+    [resources.permissions]
+    main.url = "/"
+
+    [resources.apt]
+    packages = "php8.0-ldap php8.0-mbstring php8.0-fileinfo php8.0-sqlite3 php8.0-gd php8.0-intl"
diff --git a/scripts/_common.sh b/scripts/_common.sh
@@ -4,10 +4,6 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="8.0"
-
-pkg_dependencies="php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl"
-
 #=================================================
 # PERSONAL HELPERS
 #=================================================

diff --git a/scripts/backup b/scripts/backup
@@ -10,23 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_print_info --message="Loading installation 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)
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
-
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
@@ -36,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