From 07413801459718e4c0400fcd4efc669efa32456b Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 18 Oct 2022 23:26:12 +0200
Subject: [PATCH] Fix

---
 manifest.json   | 10 +++-------
 scripts/install |  8 ++++----
 scripts/remove  |  4 ++--
 scripts/restore |  4 ++--
 scripts/upgrade |  2 +-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/manifest.json b/manifest.json
index fa6a809..dfa01c2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,13 +9,13 @@
     "version": "3.0.200~ynh1",
     "url": "https://processwire.com/",
     "upstream": {
-        "license": "MPL",
+        "license": "MPL-2.0",
         "website": "https://processwire.com/",
         "userdoc": "https://processwire.com/docs/",
         "demo": "https://processwire.com/about/demo/",
         "code": "https://github.com/processwire/processwire"
     },
-    "license": "MPL",
+    "license": "MPL-2.0",
     "maintainer": {
         "name": "",
         "email": ""
@@ -52,11 +52,7 @@
             },
             {
                 "name": "password",
-                "type": "password",
-                "help": {
-                    "en": "Use the help field to add an information for the admin about this question.",
-                    "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question."
-                }
+                "type": "password"
             }
         ]
     }
diff --git a/scripts/install b/scripts/install
index 823a3e9..fd0958e 100755
--- a/scripts/install
+++ b/scripts/install
@@ -66,7 +66,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=1
+ynh_script_progression --message="Installing dependencies..." --weight=9
 
 ynh_install_app_dependencies $pkg_dependencies
 
@@ -91,7 +91,7 @@ ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Setting up source files..." --weight=1
+ynh_script_progression --message="Setting up source files..." --weight=3
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
@@ -104,7 +104,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
+ynh_script_progression --message="Configuring PHP-FPM..." --weight=3
 
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config
@@ -112,7 +112,7 @@ ynh_add_fpm_config
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+ynh_script_progression --message="Configuring NGINX web server..." --weight=2
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
diff --git a/scripts/remove b/scripts/remove
index 36f0ade..78411dc 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -49,7 +49,7 @@ ynh_remove_nginx_config
 #=================================================
 # REMOVE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1
+ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2
 
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
@@ -57,7 +57,7 @@ ynh_remove_fpm_config
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
+ynh_script_progression --message="Removing dependencies..." --weight=4
 
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
diff --git a/scripts/restore b/scripts/restore
index 6ef3ed2..b798e03 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -77,14 +77,14 @@ ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the PHP-FPM configuration..." --time --weight=1
+ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..." --time --weight=1
+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"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 69c6e21..d2a5540 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -125,7 +125,7 @@ ynh_add_fpm_config
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config