From 755b127ef0f15e29e9179007ceb2b3be32a76789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 26 Jul 2024 21:51:09 +0200
Subject: [PATCH] cleaning

---
 scripts/install |  2 +-
 scripts/upgrade | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/scripts/install b/scripts/install
index af4536f..ce7e070 100755
--- a/scripts/install
+++ b/scripts/install
@@ -42,7 +42,7 @@ yunohost service add $app --description="Media request tool" --log="/var/log/$ap
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/database.json" --destination="$data_dir/database.json"
+ynh_add_config --template="database.json" --destination="$data_dir/database.json"
 
 chmod 650 "$data_dir/database.json"
 chown $app:$app "$data_dir/database.json"
diff --git a/scripts/upgrade b/scripts/upgrade
index 0a25c65..5cb87e9 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,8 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
@@ -23,14 +21,10 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	# 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"
 
 chown -R $app:www-data "$install_dir"