From dc19074a9e0583b2f8826b009d3c316b4523c53d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 20 Nov 2021 19:30:30 +0100
Subject: [PATCH] Fix

---
 scripts/backup  | 7 ++-----
 scripts/install | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 180eabc..26f541c 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -19,7 +19,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..."
+ynh_print_info --message="Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -30,7 +30,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Backing up the main app directory..."
 
 ynh_backup --src_path="$final_path"
 
@@ -39,14 +38,12 @@ ynh_backup --src_path="$final_path"
 #=================================================
 # BACKUP LOGROTATE
 #=================================================
-ynh_script_progression --message="Backing up logrotate configuration..."
 
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
 #=================================================
 # BACKUP THE CRON FILE
 #=================================================
-ynh_script_progression --message="Backing up cron file..."
 
 ynh_backup --src_path="/etc/cron.d/$app"
 
@@ -54,4 +51,4 @@ ynh_backup --src_path="/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)."
diff --git a/scripts/install b/scripts/install
index dc614b5..29538b4 100755
--- a/scripts/install
+++ b/scripts/install
@@ -127,7 +127,7 @@ then
     while read backup_app
     do
         ynh_replace_string --match_string="^ynh_app_backup=$" --replace_string="ynh_app_backup=$backup_app\n&" --target_file="$config_file"
-    done <<< "$(yunohost app list | grep id: | sed 's/.*id: //')"
+    done <<< "$(yunohost app list | grep -q 'id: $app' | sed 's/.*id: //')"
 fi
 
 # Calculate and store the config file checksum into the app settings
@@ -195,11 +195,10 @@ ynh_print_info --message="$Informations"
 
 if [ "$encrypt" = "true" ]
 then
-    ynh_print_OFF
     encrypt_message="Your password for encryption is '$encryption_pwd'
 
 "
-    ynh_print_ON
+
 else
     encrypt_message=""
 fi
@@ -207,7 +206,6 @@ fi
 # Get main domain and buid the url of the admin panel of the app.
 admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app"
 
-ynh_print_OFF
 echo "${encrypt_message}Archivist is going to run $run_freq.
 If you want to change the frequency, have a look to the file /etc/cron.d/$app.
 $Informations
@@ -217,7 +215,6 @@ You can configure this app easily by using the experimental __URL_TAG1__config-p
 You can also find some specific actions for this app by using the experimental __URL_TAG1__action feature__URL_TAG2__$admin_panel/actions__URL_TAG3__.
 
 If you're facing an issue or want to improve this app, please open a new issue in this __URL_TAG1__project__URL_TAG2__https://github.com/YunoHost-Apps/archivist_ynh__URL_TAG3__." > mail_to_send
-ynh_print_ON
 
 ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="root" --type=install