From 5ae9e75b8c27d9856e4ce19d80e6521e4e042122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 21 May 2024 21:09:08 +0200
Subject: [PATCH] add .env on upgrade

---
 scripts/install |  2 +-
 scripts/upgrade | 24 +++++++-----------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/scripts/install b/scripts/install
index a345950..0704336 100755
--- a/scripts/install
+++ b/scripts/install
@@ -66,7 +66,7 @@ ynh_install_composer --install_args="--ignore-platform-reqs"
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env"
+ynh_add_config --template=".env.example" --destination="$install_dir/.env"
 
 chmod 400 "$install_dir/.env"
 chown $app:$app "$install_dir/.env"
diff --git a/scripts/upgrade b/scripts/upgrade
index 7f9f261..ab6cc5f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -15,12 +15,6 @@ source /usr/share/yunohost/helpers
 
 timezone=$(cat /etc/timezone)
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -49,14 +43,10 @@ fi
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=4
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=4
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --keep="hm3.ini"
-fi
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir" --keep=".env"
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -77,12 +67,12 @@ ynh_add_nginx_config
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
-#ynh_script_progression --message="Updating a configuration file..." --weight=1
+ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-#ynh_add_config --template="../conf/hm3.sample.ini" --destination="$install_dir/hm3.ini"
+ynh_add_config --template=".env.example" --destination="$install_dir/.env"
 
-#chmod 400 "$install_dir/hm3.ini"
-#chown $app:$app "$install_dir/hm3.ini"
+chmod 400 "$install_dir/.env"
+chown $app:$app "$install_dir/.env"
 
 #=================================================
 # END OF SCRIPT