From 1b62e7f0dd569a04c01894cc9618f3f402e76566 Mon Sep 17 00:00:00 2001
From: anmol <anmol@jswan2.com>
Date: Sat, 17 Oct 2020 05:05:29 +0530
Subject: [PATCH] Systex error for ifelse in install and upgrade

---
 scripts/install | 3 ---
 scripts/upgrade | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/install b/scripts/install
index d813fc2..45efd55 100755
--- a/scripts/install
+++ b/scripts/install
@@ -145,7 +145,6 @@ if [ $dav_support -eq 0 ]
 then
 	ynh_replace_string --match_string="__DAV__" --replace_string="false" --target_file="$config"
 else
-then
 	ynh_replace_string --match_string="__DAV__" --replace_string="true" --target_file="$config"
 fi
 # Enable or disable signup for public users
@@ -153,7 +152,6 @@ if [ $signup -eq 1 ]
 then
 	ynh_replace_string --match_string="__SIGNUP__" --replace_string="false" --target_file="$config"
 else
-then
 	ynh_replace_string --match_string="__SIGNUP__" --replace_string="true" --target_file="$config"
 fi
 # Enable or disable two factor authentication support for  users
@@ -161,7 +159,6 @@ if [ $two_factor -eq 1 ]
 then
 	ynh_replace_string --match_string="__TWO_FACTOR__" --replace_string="true" --target_file="$config"
 else
-then
 	ynh_replace_string --match_string="__TWO_FACTOR__" --replace_string="false" --target_file="$config"
 fi
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 7f9ecc6..c66a796 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -168,11 +168,11 @@ ynh_replace_string  --match_string="yunomail"   --replace_string="$email"      -
 ynh_replace_string  --match_string="yunodomain" --replace_string="$domain"     --target_file="$config"
 ynh_replace_string  --match_string="language"   --replace_string="$language"   --target_file="$config"
 ynh_replace_string  --match_string="__DOMAIN__" --replace_string="$domain"     --target_file="$config"
+# Enable or disable DAV support for users
 if [ $dav_support -eq 0 ]
 then
 	ynh_replace_string --match_string="__DAV__" --replace_string="false" --target_file="$config"
 else
-then
 	ynh_replace_string --match_string="__DAV__" --replace_string="true" --target_file="$config"
 fi
 # Enable or disable signup for public users
@@ -180,7 +180,6 @@ if [ $signup -eq 1 ]
 then
 	ynh_replace_string --match_string="__SIGNUP__" --replace_string="false" --target_file="$config"
 else
-then
 	ynh_replace_string --match_string="__SIGNUP__" --replace_string="true" --target_file="$config"
 fi
 # Enable or disable two factor authentication support for  users
@@ -188,7 +187,6 @@ if [ $two_factor -eq 1 ]
 then
 	ynh_replace_string --match_string="__TWO_FACTOR__" --replace_string="true" --target_file="$config"
 else
-then
 	ynh_replace_string --match_string="__TWO_FACTOR__" --replace_string="false" --target_file="$config"
 fi