From 33867c2eb54d10b68492ad67863472d16c8248e0 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 4 Aug 2023 02:20:17 +0200
Subject: [PATCH] Fix #375

---
 scripts/_common.sh | 1 -
 scripts/install    | 1 -
 scripts/remove     | 1 -
 scripts/restore    | 1 -
 scripts/upgrade    | 4 +++-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 0c9d5a4..10c35ba 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,6 @@
 
 # dependencies used by the app
 pkg_dependencies="ffmpeg postgresql postgresql-contrib openssl g++ mailutils apt-transport-https"
-app_dependencies="prosody"
 
 nodejs_version=16
 
diff --git a/scripts/install b/scripts/install
index 5c644ee..f7e310d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -85,7 +85,6 @@ ynh_exec_warn_less yunohost firewall allow TCP $rtmp_port
 #=================================================
 ynh_script_progression --message="Installing dependencies..."
 
-ynh_exec_warn_less ynh_install_apps --apps="$app_dependencies"
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
diff --git a/scripts/remove b/scripts/remove
index 55d6cd9..8f662e9 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -111,7 +111,6 @@ ynh_script_progression --message="Removing dependencies..."
 # Remove metapackage and its dependencies
 ynh_remove_nodejs
 ynh_remove_app_dependencies
-ynh_remove_apps
 
 #=================================================
 # CLOSE A PORT
diff --git a/scripts/restore b/scripts/restore
index 1cbd162..c1a0e62 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -86,7 +86,6 @@ chown -R $app:www-data "$datadir"
 #=================================================
 ynh_script_progression --message="Reinstalling dependencies..."
 
-ynh_exec_warn_less ynh_install_apps --apps="$app_dependencies"
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
diff --git a/scripts/upgrade b/scripts/upgrade
index 1e34cf9..6721ed0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -150,6 +150,9 @@ ynh_secure_remove --file="$datadir/logs"
 mkdir -p "/var/log/$app"
 chown -R $app:$app "/var/log/$app"
 
+# Remove Prosody
+ynh_remove_apps
+
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
@@ -180,7 +183,6 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Upgrading dependencies..."
 
-ynh_exec_warn_less ynh_install_apps --apps="$app_dependencies"
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"