From a7bfe827b2d1cbac7acd7941ca744863c51da958 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 14 Nov 2020 12:52:29 +0100
Subject: [PATCH] Upgrade to 5.5.3

---
 README.md      |  2 +-
 README_fr.md   |  2 +-
 conf/app.src   |  4 ++--
 manifest.json  |  2 +-
 scripts/backup | 15 +++++++--------
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index c95f334..85eb8c5 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 WordPress is open source software you can use to create a beautiful website, blog, or app.  
 With this package, you can even activate the [multisite](https://codex.wordpress.org/Glossary#Multisite) option.
 
-**Shipped version:** 5.5.1
+**Shipped version:** 5.5.3
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index fe67ab4..6f5df47 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 WordPress est un logiciel libre que vous pouvez utiliser pour créer un site ou un blog.
 Avec ce package, vous pouvez même activer l'option [multisite](https://codex.wordpress.org/Glossary#Multisite).
 
-**Version incluse :** 5.5.1
+**Version incluse :** 5.5.3
 
 ## Captures d'écran
 
diff --git a/conf/app.src b/conf/app.src
index 3be9210..318167d 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://wordpress.org/wordpress-5.5.1.tar.gz
-SOURCE_SUM=72c6f56b4818ffd0e6e6a4ed8f3e8d4e
+SOURCE_URL=https://wordpress.org/wordpress-5.5.3.tar.gz
+SOURCE_SUM=c9220f0d5c9c593412da6c0193e43d94
 SOURCE_SUM_PRG=md5sum
 ARCH_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 252c32e..08b7946 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Create a beautiful blog or website easily",
 		"fr": "Logiciel de création de blog ou de site Web"
 	},
-	"version": "5.5.1~ynh1",
+	"version": "5.5.3~ynh1",
 	"url": "https://wordpress.org/",
 	"license": "GPL-2.0",
 	"maintainer": {
diff --git a/scripts/backup b/scripts/backup
index 7d943d5..3994989 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -19,7 +19,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=2
+ynh_print_info --message="Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -29,11 +29,13 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
-# STANDARD BACKUP STEPS
+# DECLARE DATA AND CONF FILES TO BACKUP
+#=================================================
+ynh_print_info --message="Declaring files to be backed up..."
+
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Backing up the main app directory..." --weight=2
 
 CHECK_SIZE "$final_path"
 ynh_backup --src_path="$final_path"
@@ -41,21 +43,19 @@ ynh_backup --src_path="$final_path"
 #=================================================
 # BACKUP NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Backing up nginx web server configuration..."
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # BACKUP PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Backing up php-fpm configuration..."
 
 ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================
 # BACKUP THE MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Backing up the MySQL database..." --weight=2
+ynh_print_info --message="Backing up the MySQL database..."
 
 ynh_mysql_dump_db --database="$db_name" > db.sql
 CHECK_SIZE "db.sql"
@@ -63,7 +63,6 @@ CHECK_SIZE "db.sql"
 #=================================================
 # BACKUP FAIL2BAN CONFIGURATION
 #=================================================
-ynh_script_progression --message="Backing up fail2ban configuration..."
 
 ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf"
 ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
@@ -78,4 +77,4 @@ ynh_backup "/etc/cron.d/$app"
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last
+ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."