From 476bb58f5c923122249a35d3cae0478825c9d180 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 9 Nov 2020 12:05:21 +0100
Subject: [PATCH] Small fixes

---
 README.md       | 16 +++++-----------
 scripts/install |  8 ++++----
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index f06e747..ec019f6 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,7 @@
 If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
 
 ## Overview
-[Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with
-an application-like user interface.
+[Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with an application-like user interface.
 
 **Shipped version:** 1.4.9
 
@@ -35,17 +34,12 @@ In addition to Roundcube core features, the following are made available with
 this package:
 
  * Synchronize your email aliases as identities in Roundcube
- * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu)
-   and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook)
-   plugins by default
- * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav)
-   (address book) synchronization plugin at the installation - note that if
-   you have installed ownCloud or Baïkal, it will automatically add the
-   corresponding and existing address book.
+ * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu) and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook) plugins by default
+ * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav) (address book) synchronization plugin at the installation - note that if you have installed ownCloud or Baïkal, it will automatically add the corresponding and existing address book.
 
 #### Multi-users support
-* Integrate with YunoHost users and SSO - i.e logout button, YunoHost users
-  search
+
+* Integrate with YunoHost users and SSO - i.e logout button, YunoHost users search
 
 #### Supported architectures
 
diff --git a/scripts/install b/scripts/install
index 6736c01..b4b376e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -30,7 +30,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-ynh_script_progression --message="Validating installation parameters..."
+ynh_script_progression --message="Validating installation parameters..." --weight=1
 
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
@@ -90,7 +90,7 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
@@ -124,9 +124,9 @@ rc_conf="$final_path/config/config.inc.php"
 cp ../conf/config.inc.php "$rc_conf"
 
 ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf"
-ynh_replace_string --match_string="__DBUSER__" --replace_string=$db_name --target_file="$rc_conf"
+ynh_replace_string --match_string="__DBUSER__" --replace_string="$db_name" --target_file="$rc_conf"
 ynh_replace_string --match_string="__DBPASS__" --replace_string="$db_pwd" --target_file="$rc_conf"
-ynh_replace_string --match_string="__DBNAME__" --replace_string=$db_name --target_file="$rc_conf"
+ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$rc_conf"
 
 #=================================================
 # INSTALL ADDITIONAL PLUGINS