From 80ddb1d262d1e458d1d5355deebe6ab4ed985ed3 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Fri, 14 Feb 2020 17:05:03 +0000
Subject: [PATCH] Fix startup of dev envoirement

---
 scripts/test_env.sh | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/scripts/test_env.sh b/scripts/test_env.sh
index 3760f3ddb..c40df18a9 100755
--- a/scripts/test_env.sh
+++ b/scripts/test_env.sh
@@ -67,13 +67,29 @@ function build_supervisor() {
 }
 
 
+function cleanup_lastboot() {
+    if [[ -f /workspaces/test_supervisor/config.json ]]; then
+        echo "Cleaning up last boot"
+        cp /workspaces/test_supervisor/config.json /tmp/config.json
+        jq -rM 'del(.last_boot)' /tmp/config.json > /workspaces/test_supervisor/config.json
+        rm /tmp/config.json
+    fi
+}
+
+
+function cleanup_docker() {
+    echo "Cleaning up stopped containers..."
+    docker rm $(docker ps -a -q)
+}
+
+
 function install_cli() {
     docker pull homeassistant/amd64-hassio-cli:dev
 }
 
 
 function setup_test_env() {
-    mkdir -p /workspaces/test_hassio
+    mkdir -p /workspaces/test_supervisor
 
     echo "Start Supervisor"
     docker run --rm --privileged \
@@ -82,9 +98,9 @@ function setup_test_env() {
         --security-opt apparmor:unconfined \
         -v /run/docker.sock:/run/docker.sock \
         -v /run/dbus:/run/dbus \
-        -v "/workspaces/test_hassio":/data \
+        -v "/workspaces/test_supervisor":/data \
         -v /etc/machine-id:/etc/machine-id:ro \
-        -e SUPERVISOR_SHARE="/workspaces/test_hassio" \
+        -e SUPERVISOR_SHARE="/workspaces/test_supervisor" \
         -e SUPERVISOR_NAME=hassio_supervisor \
         -e SUPERVISOR_DEV=1 \
         -e HOMEASSISTANT_REPOSITORY="homeassistant/qemux86-64-homeassistant" \
@@ -97,12 +113,9 @@ echo "Start Test-Env"
 start_docker
 trap "stop_docker" ERR
 
-# Clean homeassistant instance
-if docker rm -f homeassistant 2> /dev/null; then
-    echo "Cleanup HomeAssistant instance"
-fi
-
 build_supervisor
 install_cli
+cleanup_lastboot
+cleanup_docker
 setup_test_env
 stop_docker