From 00c04a01f51f6404cfa26d9046adba2877fde834 Mon Sep 17 00:00:00 2001
From: HugoPoi <hugo@poissonnet.fr>
Date: Sun, 4 Feb 2024 23:13:20 +0100
Subject: [PATCH 1/8] fix: upgrade issue from 1.5.3 and 1.6.0

---
 scripts/_common.sh | 104 ++++++++++++++++++++++++++++++++++++++++-
 scripts/install    | 102 +---------------------------------------
 scripts/upgrade    | 113 +++------------------------------------------
 3 files changed, 112 insertions(+), 207 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index c191e21..6d12583 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -13,5 +13,107 @@ automatic_addressbook_version=v0.4.3
 carddav_version=5.0.1
 
 #=================================================
-# EXPERIMENTAL HELPERS
+# DEFINE ALL COMMON FONCTIONS
 #=================================================
+
+install_roundcube_with_plugins() {
+
+	#=================================================
+	# INSTALL AND INITIALIZE COMPOSER
+	#=================================================
+	ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30
+
+	# Install composer.json
+	cp "$install_dir/composer.json-dist" "$install_dir/composer.json"
+
+	# Install composer
+	ynh_install_composer
+
+	#=================================================
+	# CONFIGURE ROUNDCUBE
+	#=================================================
+	ynh_script_progression --message="Configuring Roundcube..." --weight=2
+
+	deskey=$(ynh_string_random --length=24)
+	ynh_add_config --template="../conf/config.inc.php" --destination="$install_dir/config/config.inc.php"
+
+	#=================================================
+	# INSTALL ADDITIONAL PLUGINS
+	#=================================================
+	ynh_script_progression --message="Installing additional plugins..." --weight=60
+
+	# Create logs and temp directories
+	mkdir -p "$install_dir/"{logs,temp}
+
+	# Install net_LDAP
+	export COMPOSER_ALLOW_SUPERUSER=1
+	ynh_composer_exec --commands="require kolab/net_ldap3"
+
+	# Install contextmenu and automatic_addressbook plugins
+	# https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
+	# https://plugins.roundcube.net/packages/johndoh/contextmenu
+	ynh_composer_exec --commands="require \
+	    johndoh/contextmenu $contextmenu_version \
+	    sblaisot/automatic_addressbook $automatic_addressbook_version"
+
+	installed_plugins+=" 'contextmenu', 'automatic_addressbook',"
+
+	ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$install_dir/plugins/enigma/config.inc.php"
+	mkdir -p "$install_dir/plugins/enigma/home"
+	chown -R $app:www-data "$install_dir/plugins/enigma/home"
+
+	# Install CardDAV plugin
+	if [ $with_carddav -eq 1 ]
+	then
+	    ynh_composer_exec --commands="require roundcube/carddav $carddav_version --with-all-dependencies"
+
+	    carddav_tmp_config="../conf/carddav.config.inc.php"
+	    carddav_server=0
+
+	    # Copy the plugin configuration file
+	    cp $install_dir/plugins/carddav/config.inc.php{.dist,}
+
+	    # Look for installed and supported CardDAV servers
+	    for carddav_app in "nextcloud" "baikal"
+	    do
+		carddav_app_ids=$(yunohost app list | grep "id: $carddav_app" | grep -Po 'id: \K(.*)' || echo "")
+		for carddav_app_id in $carddav_app_ids
+		do
+		    carddav_server=1
+		    # Append preset configuration to the config file
+		    cat "../conf/${carddav_app}.inc.php" >> $install_dir/plugins/carddav/config.inc.php
+		    # Retrieve app settings and enable relevant preset
+		    carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain)
+		    carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path)
+		    carddav_url="https://${carddav_domain}${carddav_path%/}"
+		    ynh_replace_string --match_string="{${carddav_app}_id}" --replace_string="$carddav_app_id" --target_file="$install_dir/plugins/carddav/config.inc.php"
+		    ynh_replace_string --match_string="{${carddav_app}_url}" --replace_string="$carddav_url" --target_file="$install_dir/plugins/carddav/config.inc.php"
+		done
+	    done
+
+	    # Do not actualy add the cardDAV plugin if there's no cardDAV server available...
+	    if [ $carddav_server -eq 1 ]
+	    then
+		installed_plugins+=" 'carddav',"
+	    fi
+	fi
+
+	#=================================================
+	# UPDATE ROUNDCUBE CONFIGURATION
+	#=================================================
+	ynh_script_progression --message="Updating Roundcube configuration..." --weight=3
+
+	ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$install_dir/config/config.inc.php"
+	    
+	# Store the config file checksum into the app settings
+	ynh_store_file_checksum --file="$install_dir/config/config.inc.php"
+
+	chmod 400 "$install_dir/config/config.inc.php"
+	chown $app:$app "$install_dir/config/config.inc.php"
+
+	# Update javascript dependencies
+	(cd "$install_dir"
+	  /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh -v ?)
+	    
+}
+
diff --git a/scripts/install b/scripts/install
index 25ac65e..e555d2f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -48,19 +48,6 @@ ynh_add_nginx_config
 # Create a dedicated php-fpm config
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
-#=================================================
-# SPECIFIC SETUP
-#=================================================
-# INSTALL AND INITIALIZE COMPOSER
-#=================================================
-ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30
-
-# Install composer.json
-cp "$install_dir/composer.json-dist" "$install_dir/composer.json"
-
-# Install composer
-ynh_install_composer
-
 #=================================================
 # INITIALIZE DATABASE
 #=================================================
@@ -69,93 +56,8 @@ ynh_script_progression --message="Initializing database..." --weight=3
 ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < "$install_dir/SQL/mysql.initial.sql"
 
 #=================================================
-# CONFIGURE ROUNDCUBE
-#=================================================
-ynh_script_progression --message="Configuring Roundcube..." --weight=2
-
-deskey=$(ynh_string_random --length=24)
-ynh_add_config --template="../conf/config.inc.php" --destination="$install_dir/config/config.inc.php"
-
-#=================================================
-# INSTALL ADDITIONAL PLUGINS
-#=================================================
-ynh_script_progression --message="Installing additional plugins..." --weight=60
-
-# Create logs and temp directories
-mkdir -p "$install_dir/"{logs,temp}
-
-# Install net_LDAP
-export COMPOSER_ALLOW_SUPERUSER=1
-ynh_composer_exec --commands="require kolab/net_ldap3"
-
-# Install contextmenu and automatic_addressbook plugins
-# https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
-# https://plugins.roundcube.net/packages/johndoh/contextmenu
-ynh_composer_exec --commands="require \
-    johndoh/contextmenu $contextmenu_version \
-    sblaisot/automatic_addressbook $automatic_addressbook_version"
-
-installed_plugins+=" 'contextmenu', 'automatic_addressbook',"
-
-ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$install_dir/plugins/enigma/config.inc.php"
-mkdir -p "$install_dir/plugins/enigma/home"
-chown -R $app:www-data "$install_dir/plugins/enigma/home"
-
-# Install CardDAV plugin
-if [ $with_carddav -eq 1 ]
-then
-    ynh_composer_exec --commands="require roundcube/carddav $carddav_version --with-all-dependencies"
-
-    carddav_tmp_config="../conf/carddav.config.inc.php"
-    carddav_server=0
-
-    # Copy the plugin configuration file
-    cp $install_dir/plugins/carddav/config.inc.php{.dist,}
-
-    # Look for installed and supported CardDAV servers
-    for carddav_app in "nextcloud" "baikal"
-    do
-        carddav_app_ids=$(yunohost app list | grep "id: $carddav_app" | grep -Po 'id: \K(.*)' || echo "")
-        for carddav_app_id in $carddav_app_ids
-        do
-            carddav_server=1
-            # Append preset configuration to the config file
-            cat "../conf/${carddav_app}.inc.php" >> $install_dir/plugins/carddav/config.inc.php
-            # Retrieve app settings and enable relevant preset
-            carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain)
-            carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path)
-            carddav_url="https://${carddav_domain}${carddav_path%/}"
-            ynh_replace_string --match_string="{${carddav_app}_id}" --replace_string="$carddav_app_id" --target_file="$install_dir/plugins/carddav/config.inc.php"
-            ynh_replace_string --match_string="{${carddav_app}_url}" --replace_string="$carddav_url" --target_file="$install_dir/plugins/carddav/config.inc.php"
-        done
-    done
-
-    # Do not actualy add the cardDAV plugin if there's no cardDAV server available...
-    if [ $carddav_server -eq 1 ]
-    then
-        installed_plugins+=" 'carddav',"
-    fi
-fi
-
-#=================================================
-# UPDATE ROUNDCUBE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Updating Roundcube configuration..." --weight=3
-
-ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$install_dir/config/config.inc.php"
-
-# Update javascript dependencies
-(cd "$install_dir"
-/usr/bin/php$phpversion -q ./bin/install-jsdeps.sh -v ?)
-
-# Store the config file checksum into the app settings
-ynh_store_file_checksum --file="$install_dir/config/config.inc.php"
-
-chmod 400 "$install_dir/config/config.inc.php"
-chown $app:$app "$install_dir/config/config.inc.php"
-
-#=================================================
-# END OF SCRIPT
+# INSTALL DEPENDENCIES AND PLUGINS
 #=================================================
+install_roundcube_with_plugins
 
 ynh_script_progression --message="Installation of $app completed" --last
diff --git a/scripts/upgrade b/scripts/upgrade
index c9be392..19f04a3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -94,116 +94,17 @@ ynh_add_nginx_config
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-    ynh_script_progression --message="Reconfiguring Roundcube..." --weight=1
 
-    deskey=$(ynh_string_random --length=24)
-    ynh_add_config --template="../conf/config.inc.php" --destination="$install_dir/config/config.inc.php"
+	install_roundcube_with_plugins
 
-    #=================================================
-    # UPDATE DEPENDENCIES WITH COMPOSER
-    #=================================================
-    ynh_script_progression --message="Updating dependencies with Composer..." --weight=30
-
-    # Upgrade composer itself
-    ynh_install_composer
-
-    # Check if dependencies need to be updated with Composer
-    if [ -f "$install_dir/composer.json" ]
-    then
-        ynh_exec_warn_less ynh_composer_exec --commands="update"
-        # Update plugin-installer for Composer version 2.0
-        ynh_exec_warn_less ynh_composer_exec --commands="require roundcube/plugin-installer:>=0.2.0"
-    else
-        # Install composer.json
-        cp "$install_dir/composer.json-dist" "$install_dir/composer.json"
-    fi
-
-    #=================================================
-    # UPGRADE ADDITIONAL PLUGINS
-    #=================================================
-    ynh_script_progression --message="Upgrading additional plugins..." --weight=30
-
-    # Create logs and temp directories
-    mkdir -p "$install_dir/"{logs,temp}
-
-    # Install net_LDAP
-    ynh_composer_exec --commands="require kolab/net_ldap3"
-
-    # Update or install contextmenu and automatic_addressbook plugins
-    # https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
-    # https://plugins.roundcube.net/packages/johndoh/contextmenu
-    ynh_composer_exec --commands="update --no-dev --prefer-dist \
-        johndoh/contextmenu $contextmenu_version \
-        sblaisot/automatic_addressbook $automatic_addressbook_version"
-
-    installed_plugins+=" 'contextmenu', 'automatic_addressbook',"
-
-    ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$install_dir/plugins/enigma/config.inc.php"
-    mkdir -p "$install_dir/plugins/enigma/home"
-    chown -R $app:$app "$install_dir/plugins/enigma/home"
-
-    # Update or install CardDAV plugin
-    if [ $with_carddav -eq 1 ]
-    then
-        ynh_composer_exec --commands="require roundcube/carddav $carddav_version --with-all-dependencies"
-
-        carddav_tmp_config="../conf/carddav.config.inc.php"
-        carddav_server=0
-
-        # Copy the plugin configuration file
-        cp $install_dir/plugins/carddav/config.inc.php{.dist,}
-
-        # Look for installed and supported CardDAV servers
-        for carddav_app in "nextcloud" "baikal"
-        do
-            carddav_app_ids=$(yunohost app list | grep "id: $carddav_app" | grep -Po 'id: \K(.*)' || echo "")
-            for carddav_app_id in $carddav_app_ids
-            do
-                carddav_server=1
-                # Append preset configuration to the config file
-                cat "../conf/${carddav_app}.inc.php" >> $install_dir/plugins/carddav/config.inc.php
-                # Retrieve app settings and enable relevant preset
-                carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain)
-                carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path)
-                carddav_url="https://${carddav_domain}${carddav_path%/}"
-                ynh_replace_string --match_string="{${carddav_app}_id}" --replace_string="$carddav_app_id" --target_file="$install_dir/plugins/carddav/config.inc.php"
-                ynh_replace_string --match_string="{${carddav_app}_url}" --replace_string="$carddav_url" --target_file="$install_dir/plugins/carddav/config.inc.php"
-            done
-        done
-
-        # Do not actually add the carddav plugin if there's no carddav server available...
-        if [ $carddav_server -eq 1 ]
-        then
-            installed_plugins+=" 'carddav',"
-        fi
-    fi
-
-    #=================================================
-    # UPDATE ROUNDCUBE CONFIGURATION
-    #=================================================
-    ynh_script_progression --message="Updating $app configuration..." --weight=4
-
-    ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$install_dir/config/config.inc.php"
-
-    # Update JavaScript dependencies
-    pushd "$install_dir"
-    COMPOSER_ALLOW_SUPERUSER=1 "php$phpversion" ./bin/update.sh --version="?" -y <<< ""
-
-        # Store the config file checksum into the app settings
-        ynh_store_file_checksum --file="$install_dir/config/config.inc.php"
-
-        chmod 400 "$install_dir/config/config.inc.php"
-        chown $app:$app "$install_dir/config/config.inc.php"
-
-        #=================================================
-        # UPDATE ROUNDCUBE CORE
-        #=================================================
-        ynh_script_progression --message="Updating $app core..." --weight=4
-
-    COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn "php$phpversion" ./bin/update.sh --version=$oldversion -y
-    popd
+	# Migrate roundcube database
+	pushd "$install_dir"
+	COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn "php$phpversion" ./bin/update.sh --version=$oldversion -y
+	popd
 fi
 
+
+
 #=================================================
 # END OF SCRIPT
 #=================================================

From 9239647b623ccb0d245bee71c45da74ef882bce8 Mon Sep 17 00:00:00 2001
From: HugoPoi <hugo@poissonnet.fr>
Date: Sun, 4 Feb 2024 23:21:02 +0100
Subject: [PATCH 2/8] refactor: remove upgrade_type checking

---
 scripts/upgrade | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 19f04a3..461e834 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,12 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -64,13 +58,10 @@ fi
 # Get the current version of roundcube
 oldversion=$(grep RCMAIL_VERSION "$install_dir/program/include/iniset.php" | cut -d\' -f4)
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=3
+ynh_script_progression --message="Upgrading source files..." --weight=3
 
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir"
-fi
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir"
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -91,19 +82,12 @@ ynh_add_nginx_config
 #=================================================
 # CONFIGURE ROUNDCUBE
 #=================================================
+install_roundcube_with_plugins
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-
-	install_roundcube_with_plugins
-
-	# Migrate roundcube database
-	pushd "$install_dir"
-	COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn "php$phpversion" ./bin/update.sh --version=$oldversion -y
-	popd
-fi
-
-
+# Migrate roundcube database
+pushd "$install_dir"
+COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn "php$phpversion" ./bin/update.sh --version=$oldversion -y
+popd
 
 #=================================================
 # END OF SCRIPT

From 03829657e8f7d94f8b4303b262048b982df294fc Mon Sep 17 00:00:00 2001
From: HugoPoi <hugo@poissonnet.fr>
Date: Sun, 4 Feb 2024 23:31:25 +0100
Subject: [PATCH 3/8] fix: add composer update after good setup

---
 scripts/upgrade | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 461e834..1882d2c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,6 +84,8 @@ ynh_add_nginx_config
 #=================================================
 install_roundcube_with_plugins
 
+ynh_composer_exec --commands="update --no-dev"
+
 # Migrate roundcube database
 pushd "$install_dir"
 COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn "php$phpversion" ./bin/update.sh --version=$oldversion -y

From a2bc97b5fa6d9d1af5d8bf8cbe963af86dfc8ded Mon Sep 17 00:00:00 2001
From: HugoPoi <hugo@poissonnet.fr>
Date: Mon, 5 Feb 2024 15:08:07 +0100
Subject: [PATCH 4/8] refactor: common install functions

---
 scripts/_common.sh | 95 +++++++++++++++++++---------------------------
 scripts/install    | 21 +++++++++-
 scripts/upgrade    | 22 ++++++++++-
 3 files changed, 78 insertions(+), 60 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 6d12583..eefe918 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -16,32 +16,17 @@ carddav_version=5.0.1
 # DEFINE ALL COMMON FONCTIONS
 #=================================================
 
-install_roundcube_with_plugins() {
-
-	#=================================================
-	# INSTALL AND INITIALIZE COMPOSER
-	#=================================================
-	ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30
-
-	# Install composer.json
+install_composer() {
 	cp "$install_dir/composer.json-dist" "$install_dir/composer.json"
-
-	# Install composer
 	ynh_install_composer
+}
 
-	#=================================================
-	# CONFIGURE ROUNDCUBE
-	#=================================================
-	ynh_script_progression --message="Configuring Roundcube..." --weight=2
-
+configure_roundcube() {
 	deskey=$(ynh_string_random --length=24)
 	ynh_add_config --template="../conf/config.inc.php" --destination="$install_dir/config/config.inc.php"
+}
 
-	#=================================================
-	# INSTALL ADDITIONAL PLUGINS
-	#=================================================
-	ynh_script_progression --message="Installing additional plugins..." --weight=60
-
+install_ldap_addressbook_contextmenu_plugins() {
 	# Create logs and temp directories
 	mkdir -p "$install_dir/"{logs,temp}
 
@@ -61,48 +46,44 @@ install_roundcube_with_plugins() {
 	ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$install_dir/plugins/enigma/config.inc.php"
 	mkdir -p "$install_dir/plugins/enigma/home"
 	chown -R $app:www-data "$install_dir/plugins/enigma/home"
+}
 
-	# Install CardDAV plugin
-	if [ $with_carddav -eq 1 ]
-	then
-	    ynh_composer_exec --commands="require roundcube/carddav $carddav_version --with-all-dependencies"
+install_carddav_plugin(){
+	ynh_composer_exec --commands="require roundcube/carddav $carddav_version --with-all-dependencies"
 
-	    carddav_tmp_config="../conf/carddav.config.inc.php"
-	    carddav_server=0
+	carddav_tmp_config="../conf/carddav.config.inc.php"
+	carddav_server=0
 
-	    # Copy the plugin configuration file
-	    cp $install_dir/plugins/carddav/config.inc.php{.dist,}
+	# Copy the plugin configuration file
+	cp $install_dir/plugins/carddav/config.inc.php{.dist,}
 
-	    # Look for installed and supported CardDAV servers
-	    for carddav_app in "nextcloud" "baikal"
+	# Look for installed and supported CardDAV servers
+	for carddav_app in "nextcloud" "baikal"
+	do
+	    carddav_app_ids=$(yunohost app list | grep "id: $carddav_app" | grep -Po 'id: \K(.*)' || echo "")
+	    for carddav_app_id in $carddav_app_ids
 	    do
-		carddav_app_ids=$(yunohost app list | grep "id: $carddav_app" | grep -Po 'id: \K(.*)' || echo "")
-		for carddav_app_id in $carddav_app_ids
-		do
-		    carddav_server=1
-		    # Append preset configuration to the config file
-		    cat "../conf/${carddav_app}.inc.php" >> $install_dir/plugins/carddav/config.inc.php
-		    # Retrieve app settings and enable relevant preset
-		    carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain)
-		    carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path)
-		    carddav_url="https://${carddav_domain}${carddav_path%/}"
-		    ynh_replace_string --match_string="{${carddav_app}_id}" --replace_string="$carddav_app_id" --target_file="$install_dir/plugins/carddav/config.inc.php"
-		    ynh_replace_string --match_string="{${carddav_app}_url}" --replace_string="$carddav_url" --target_file="$install_dir/plugins/carddav/config.inc.php"
-		done
+	        carddav_server=1
+	        # Append preset configuration to the config file
+	        cat "../conf/${carddav_app}.inc.php" >> $install_dir/plugins/carddav/config.inc.php
+	        # Retrieve app settings and enable relevant preset
+	        carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain)
+	        carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path)
+	        carddav_url="https://${carddav_domain}${carddav_path%/}"
+	        ynh_replace_string --match_string="{${carddav_app}_id}" --replace_string="$carddav_app_id" --target_file="$install_dir/plugins/carddav/config.inc.php"
+	        ynh_replace_string --match_string="{${carddav_app}_url}" --replace_string="$carddav_url" --target_file="$install_dir/plugins/carddav/config.inc.php"
 	    done
+	done
 
-	    # Do not actualy add the cardDAV plugin if there's no cardDAV server available...
-	    if [ $carddav_server -eq 1 ]
-	    then
-		installed_plugins+=" 'carddav',"
-	    fi
+	# Do not actualy add the cardDAV plugin if there's no cardDAV server available...
+	if [ $carddav_server -eq 1 ]
+	then
+	    installed_plugins+=" 'carddav',"
 	fi
 
-	#=================================================
-	# UPDATE ROUNDCUBE CONFIGURATION
-	#=================================================
-	ynh_script_progression --message="Updating Roundcube configuration..." --weight=3
+}
 
+enable_plugins_in_config() {
 	ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$install_dir/config/config.inc.php"
 	    
 	# Store the config file checksum into the app settings
@@ -110,10 +91,10 @@ install_roundcube_with_plugins() {
 
 	chmod 400 "$install_dir/config/config.inc.php"
 	chown $app:$app "$install_dir/config/config.inc.php"
-
-	# Update javascript dependencies
-	(cd "$install_dir"
-	  /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh -v ?)
-	    
+}
+
+update_javascript_deps() {
+	(cd "$install_dir"
+	  /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh -v ?)
 }
 
diff --git a/scripts/install b/scripts/install
index e555d2f..4ca8152 100644
--- a/scripts/install
+++ b/scripts/install
@@ -58,6 +58,25 @@ ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name
 #=================================================
 # INSTALL DEPENDENCIES AND PLUGINS
 #=================================================
-install_roundcube_with_plugins
+ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30
+install_composer
+
+ynh_script_progression --message="Configuring Roundcube..." --weight=2
+configure_roundcube
+
+ynh_script_progression --message="Installing ldap, automatic addressbook and contextmenu plugins..." --weight=60
+install_ldap_addressbook_contextmenu_plugins
+	
+if [ $with_carddav -eq 1 ]
+then
+        ynh_script_progression --message="Installing carddav plugin..." --weight=30
+	install_carddav_plugin
+fi
+
+ynh_script_progression --message="Install javascript dependencies..." --weight=10
+update_javascript_deps
+
+ynh_script_progression --message="Updating Roundcube configuration..." --weight=3
+enable_plugins_in_config
 
 ynh_script_progression --message="Installation of $app completed" --last
diff --git a/scripts/upgrade b/scripts/upgrade
index 1882d2c..c4fb6f8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,10 +82,28 @@ ynh_add_nginx_config
 #=================================================
 # CONFIGURE ROUNDCUBE
 #=================================================
-install_roundcube_with_plugins
-
+ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30
+install_composer
 ynh_composer_exec --commands="update --no-dev"
 
+ynh_script_progression --message="Configuring Roundcube..." --weight=2
+configure_roundcube
+
+ynh_script_progression --message="Installing ldap, automatic addressbook and contextmenu plugins..." --weight=60
+install_ldap_addressbook_contextmenu_plugins
+	
+if [ $with_carddav -eq 1 ]
+then
+        ynh_script_progression --message="Installing carddav plugin..." --weight=30
+	install_carddav_plugin
+fi
+
+ynh_script_progression --message="Install javascript dependencies..." --weight=10
+update_javascript_deps
+
+ynh_script_progression --message="Updating Roundcube configuration..." --weight=3
+enable_plugins_in_config
+
 # Migrate roundcube database
 pushd "$install_dir"
 COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn "php$phpversion" ./bin/update.sh --version=$oldversion -y

From 1ff2ece54020f9a856be72568fa2472d06b572e2 Mon Sep 17 00:00:00 2001
From: HugoPoi <hugo@poissonnet.fr>
Date: Mon, 5 Feb 2024 15:13:57 +0100
Subject: [PATCH 5/8] style: linter no quote warn

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index c4fb6f8..bf549fc 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -106,7 +106,7 @@ enable_plugins_in_config
 
 # Migrate roundcube database
 pushd "$install_dir"
-COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn "php$phpversion" ./bin/update.sh --version=$oldversion -y
+COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn php$phpversion ./bin/update.sh --version=$oldversion -y
 popd
 
 #=================================================

From 4266a057019be530f3bc442c31d8e18a7f6328b6 Mon Sep 17 00:00:00 2001
From: HugoPoi <hugo@poissonnet.fr>
Date: Mon, 5 Feb 2024 15:20:50 +0100
Subject: [PATCH 6/8] fix: only composer update during upgrade

---
 scripts/_common.sh | 3 +--
 scripts/install    | 3 ++-
 scripts/upgrade    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index eefe918..090d8c1 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -16,9 +16,8 @@ carddav_version=5.0.1
 # DEFINE ALL COMMON FONCTIONS
 #=================================================
 
-install_composer() {
+setup_composer_deps() {
 	cp "$install_dir/composer.json-dist" "$install_dir/composer.json"
-	ynh_install_composer
 }
 
 configure_roundcube() {
diff --git a/scripts/install b/scripts/install
index 4ca8152..ae337be 100644
--- a/scripts/install
+++ b/scripts/install
@@ -59,7 +59,8 @@ ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name
 # INSTALL DEPENDENCIES AND PLUGINS
 #=================================================
 ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30
-install_composer
+setup_composer_deps
+ynh_install_composer
 
 ynh_script_progression --message="Configuring Roundcube..." --weight=2
 configure_roundcube
diff --git a/scripts/upgrade b/scripts/upgrade
index bf549fc..3929a14 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -83,7 +83,7 @@ ynh_add_nginx_config
 # CONFIGURE ROUNDCUBE
 #=================================================
 ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30
-install_composer
+setup_composer_deps
 ynh_composer_exec --commands="update --no-dev"
 
 ynh_script_progression --message="Configuring Roundcube..." --weight=2

From dfe6ee58dcb4c18e43b0bb1660e8efd95b95a69e Mon Sep 17 00:00:00 2001
From: HugoPoi <hugo@poissonnet.fr>
Date: Mon, 5 Feb 2024 15:26:01 +0100
Subject: [PATCH 7/8] fix: move composer update after require plugins

---
 scripts/upgrade | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 3929a14..fe6ab3b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,9 +82,7 @@ ynh_add_nginx_config
 #=================================================
 # CONFIGURE ROUNDCUBE
 #=================================================
-ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30
 setup_composer_deps
-ynh_composer_exec --commands="update --no-dev"
 
 ynh_script_progression --message="Configuring Roundcube..." --weight=2
 configure_roundcube
@@ -98,6 +96,9 @@ then
 	install_carddav_plugin
 fi
 
+ynh_script_progression --message="Updating Roundcube dependencies with Composer..." --weight=30
+ynh_composer_exec --commands="update --no-dev"
+
 ynh_script_progression --message="Install javascript dependencies..." --weight=10
 update_javascript_deps
 

From c913078c2999a29c94020ed3bf4cfbaee5799c6a Mon Sep 17 00:00:00 2001
From: HugoPoi <hugo@poissonnet.fr>
Date: Mon, 5 Feb 2024 17:13:44 +0100
Subject: [PATCH 8/8] fix: try to manage composer update correctly

---
 scripts/_common.sh | 7 ++++---
 scripts/upgrade    | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 090d8c1..ea8d380 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -31,14 +31,15 @@ install_ldap_addressbook_contextmenu_plugins() {
 
 	# Install net_LDAP
 	export COMPOSER_ALLOW_SUPERUSER=1
-	ynh_composer_exec --commands="require kolab/net_ldap3"
+	ynh_composer_exec --commands="require kolab/net_ldap3 --update-with-all-dependencies"
 
 	# Install contextmenu and automatic_addressbook plugins
 	# https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
 	# https://plugins.roundcube.net/packages/johndoh/contextmenu
 	ynh_composer_exec --commands="require \
 	    johndoh/contextmenu $contextmenu_version \
-	    sblaisot/automatic_addressbook $automatic_addressbook_version"
+	    sblaisot/automatic_addressbook $automatic_addressbook_version \
+	    --update-with-all-dependencies"
 
 	installed_plugins+=" 'contextmenu', 'automatic_addressbook',"
 
@@ -48,7 +49,7 @@ install_ldap_addressbook_contextmenu_plugins() {
 }
 
 install_carddav_plugin(){
-	ynh_composer_exec --commands="require roundcube/carddav $carddav_version --with-all-dependencies"
+	ynh_composer_exec --commands="require roundcube/carddav $carddav_version --update-with-all-dependencies"
 
 	carddav_tmp_config="../conf/carddav.config.inc.php"
 	carddav_server=0
diff --git a/scripts/upgrade b/scripts/upgrade
index fe6ab3b..de29bf4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,7 +82,9 @@ ynh_add_nginx_config
 #=================================================
 # CONFIGURE ROUNDCUBE
 #=================================================
+ynh_script_progression --message="Updating Roundcube dependencies with Composer..." --weight=30
 setup_composer_deps
+ynh_composer_exec --commands="update --no-dev"
 
 ynh_script_progression --message="Configuring Roundcube..." --weight=2
 configure_roundcube
@@ -96,9 +98,6 @@ then
 	install_carddav_plugin
 fi
 
-ynh_script_progression --message="Updating Roundcube dependencies with Composer..." --weight=30
-ynh_composer_exec --commands="update --no-dev"
-
 ynh_script_progression --message="Install javascript dependencies..." --weight=10
 update_javascript_deps