From c7bee28a7f9791f5b7bf483e98cc1babaa5704a4 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Tue, 24 Jan 2023 14:54:26 +0100
Subject: [PATCH] Clean file

---
 .../rootfs/etc/cont-init.d/99-run.sh              | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/enedisgateway2mqtt/rootfs/etc/cont-init.d/99-run.sh b/enedisgateway2mqtt/rootfs/etc/cont-init.d/99-run.sh
index 75f01a29a..731ae8dee 100755
--- a/enedisgateway2mqtt/rootfs/etc/cont-init.d/99-run.sh
+++ b/enedisgateway2mqtt/rootfs/etc/cont-init.d/99-run.sh
@@ -19,19 +19,15 @@ if [ -f /data/config.yaml ] && [ ! -L /data/config.yaml ]; then
     mv /data/config.yaml "$CONFIGSOURCE".bak
 fi
 
-######################################
-# MIGRATE FOLDER TO MYELECTRICALDATA #
-######################################
+#########################################################
+# MIGRATION FROM ENEDISGATEWAY2MQTT TO MYELECTRICALDATA #
+#########################################################
 
 if [ -f /config/addons_config/enedisgateway2mqtt/config.yaml ]; then
     mv /config/addons_config/enedisgateway2mqtt/* "$(dirname "${CONFIGSOURCE}")"/
     rm -r /config/addons_config/enedisgateway2mqtt
 fi
 
-############
-# DATABASE #
-############
-
 # If migration was performed, save file in config folder
 if [ -f /data/enedisgateway.db.migrate ]; then
     bashio::log.warning "Migration performed, enedisgateway.db.migrate copied in $(dirname "${CONFIGSOURCE}")"
@@ -40,7 +36,6 @@ fi
 
 # If migration was performed, save file in config folder
 if [ -f /data/cache.db ] && [ ! -f "$DATABASESOURCE" ]; then
-    if [ -f "$(dirname "${CONFIGSOURCE}")"/enedisgateway.db ]; then mv "$(dirname "${CONFIGSOURCE}")"/enedisgateway.db "$(dirname "${CONFIGSOURCE}")"/enedisgateway.db.bak2; fi
     mv /data/cache.db "$(dirname "${CONFIGSOURCE}")"
 fi
 
@@ -49,6 +44,10 @@ if [ -f "$(dirname "${CONFIGSOURCE}")"/enedisgateway.db ]; then
     mv "$(dirname "${CONFIGSOURCE}")"/enedisgateway.db /data
 fi
 
+############
+# DATABASE #
+############
+
 # Check if database is here or create symlink
 if [ -f "$DATABASESOURCE" ]; then
     # Create symlink if not existing yet