From 76f54a939bc72dd6a855c2fb6b65e43160a1ff12 Mon Sep 17 00:00:00 2001
From: mrflos <mrflos@develop.lab12.io>
Date: Fri, 17 May 2024 17:07:14 +0200
Subject: [PATCH] fix(install) : better if conditions and labels

---
 manifest.toml   | 8 ++++----
 scripts/install | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 19e6d95..23083ea 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -51,15 +51,15 @@ default = "fr"
 ask.en = "Choose the wiki model"
 ask.fr = "Choisissez le modèle de wiki"
 type = "select"
-choices = ["default", "CLIC"]
-default = "default"
+choices = ["YesWiki", "CLIC"]
+default = "YesWiki"
 
 [install.authprovider]
 ask.en = "Choose the authentification type"
 ask.fr = "Choisissez le système d'authentification"
 type = "select"
-choices = ["LDAP Yunohost", "YesWiki"]
-default = "LDAP Yunohost"
+choices = ["Yunohost LDAP", "YesWiki"]
+default = "Yunohost LDAP"
 
 [install.admin]
 type = "user"
diff --git a/scripts/install b/scripts/install
index 1f3c240..fbcc4c0 100755
--- a/scripts/install
+++ b/scripts/install
@@ -51,7 +51,7 @@ admin_temp_pass=$(ynh_string_random 20)
 
 wiki_name_escaped=$(echo "$wiki_name" | sed 's/ /%20/g')
 
-if [$wikimodel = "CLIC"]; then
+if [ $wikimodel = "CLIC" ]; then
         # replace default yeswiki model with CLIC model
         mv $install_dir/setup/sql/default-content.sql $install_dir/setup/sql/default-content.sql.original
         cp ../conf/CLIC/default-content.sql $install_dir/setup/sql/default-content.sql
@@ -63,7 +63,7 @@ ynh_local_curl "/?PagePrincipale&installAction=install" "config[default_language
         "admin_name=$admin" "admin_password=$admin_temp_pass" "admin_password_conf=$admin_temp_pass" \
         "admin_email=$admin%40$domain" "submit=Continue"
 
-if [$wikimodel = "CLIC"]; then
+if [ $wikimodel = "CLIC" ]; then
         # restore original yeswiki model
         mv -f $install_dir/setup/sql/default-content.sql.original $install_dir/setup/sql/default-content.sql
 fi
@@ -72,7 +72,7 @@ fi
 # (kind of strange, should be doable using the previous curl?)
 ynh_replace_string --match_string="'allow_raw_html' => false," --replace_string="'allow_raw_html' => true," --target_file="$install_dir/wakka.config.php"
 
-if [$authprovider = "Yunohost LDAP"]; then
+if [ $authprovider = "Yunohost LDAP" ]; then
         #=================================================
         # DOWNLOAD AND CONFIGURE LDAP PLUGIN
         #=================================================
@@ -88,7 +88,7 @@ if [$authprovider = "Yunohost LDAP"]; then
         ynh_replace_string --match_string=");" --replace_string="  'ldap_base' => 'ou=users,dc=yunohost,dc=org'\n);" --target_file="$install_dir/wakka.config.php"
 fi
 
-if [$wikimodel = "CLIC"]; then
+if [ $wikimodel = "CLIC" ]; then
         #=================================================
         # DOWNLOAD AND CONFIGURE FERME PLUGIN
         #=================================================