From 4446f8750b6b23854a1db5525effcdb17d2a93dd Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Fri, 2 Jul 2021 16:58:08 +0200
Subject: [PATCH] fix upgrade and config

---
 scripts/config  | 1 +
 scripts/upgrade | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/config b/scripts/config
index 25f01d3..4a29c5b 100644
--- a/scripts/config
+++ b/scripts/config
@@ -17,6 +17,7 @@ source _ynh_add_fpm_config.sh
 app=$YNH_APP_INSTANCE_NAME
 
 fpm_config_dir=$(ynh_app_setting_get --app=$app --key=fpm_config_dir)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
 # SPECIFIC CODE
diff --git a/scripts/upgrade b/scripts/upgrade
index e0426df..6b05774 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -232,10 +232,11 @@ pihole_storage="/etc/pihole"
 if [ "$pihole_version" == "Last 3.X" ]
 then
     cp "$pihole_local_repo/advanced/logrotate" "$pihole_storage/logrotate"
+    dnsmasq_user=$(grep DNSMASQ_USER= /etc/init.d/dnsmasq | cut -d'"' -f2)
 else
     cp "$pihole_local_repo/advanced/Templates/logrotate" "$pihole_storage/logrotate"
+    dnsmasq_user=$(grep FTLUSER= /etc/init.d/pihole-FTL | cut -d'=' -f2)
 fi
-dnsmasq_user=$(grep DNSMASQ_USER= /etc/init.d/dnsmasq | cut -d'"' -f2)
 sed -i "/# su #/d;" "$pihole_storage/logrotate"
 
 #=================================================