Move FTL cleanup to dedicated function and include removing the PID if it exists

Use this on both container start and container stop for maximum effect

Author: PromoFaux

src/bash_functions.sh

@@ -149,6 +149,12 @@ ftl_config() {
     setup_web_password
 }
 
+ftl_cleanup(){
+    FTL_PID_FILE="$(getFTLConfigValue files.pid)"
+    # Cleanup
+    rm -f /run/pihole/FTL.sock /dev/shm/FTL-* "${FTL_PID_FILE}"
+}
+
 migrate_v5_configs() {
     # Previously, Pi-hole created a number of files in /etc/dnsmasq.d
     # During migration, their content is copied into the new single source of

src/start.sh

@@ -53,8 +53,7 @@ start() {
 
   echo "  [i] pihole-FTL pre-start checks"
   # Remove possible leftovers from previous pihole-FTL processes
-  rm -f /dev/shm/FTL-* 2>/dev/null
-  rm -f /run/pihole/FTL.sock
+  ftl_cleanup
 
   fix_capabilities
   sh /opt/pihole/pihole-FTL-prestart.sh
@@ -135,6 +134,8 @@ stop() {
     FTL_EXIT_CODE=1
   fi
 
+  ftl_cleanup
+
   echo ""
   echo "  [i] pihole-FTL exited with status $FTL_EXIT_CODE"
   echo ""