From 7437480379d865fd3c84c8ea2fed85022be24522 Mon Sep 17 00:00:00 2001
From: pvizeli <pvizeli@syshack.ch>
Date: Thu, 30 Mar 2017 17:51:38 +0200
Subject: [PATCH] simplify env

---
 hassio_api/hassio/config.py          | 11 +++++------
 hassio_api/hassio/const.py           |  6 +-----
 hassio_api/hassio/dock/supervisor.py |  5 +++--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/hassio_api/hassio/config.py b/hassio_api/hassio/config.py
index 304a7587b..f79efdd69 100644
--- a/hassio_api/hassio/config.py
+++ b/hassio_api/hassio/config.py
@@ -5,8 +5,7 @@ import os
 
 from .const import (
     FILE_HASSIO_CONFIG, HOMEASSISTANT_TAG, HOMEASSISTANT_IMAGE,
-    HOMEASSISTANT_SSL, HOMEASSISTANT_CONFIG, HASSIO_SHARE_EXT,
-    HASSIO_SHARE_INT)
+    HOMEASSISTANT_SSL, HOMEASSISTANT_CONFIG, HASSIO_SHARE)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -60,19 +59,19 @@ class CoreConfig(object):
     @property
     def path_config_docker(self):
         """Return config path extern for docker."""
-        return HOMEASSISTANT_CONFIG.format(HASSIO_SHARE_EXT)
+        return HOMEASSISTANT_CONFIG.format(os.environ['SUPERVISOR_NAME'])
 
     @property
     def path_config(self):
         """Return config path inside supervisor."""
-        return HOMEASSISTANT_CONFIG.format(HASSIO_SHARE_INT)
+        return HOMEASSISTANT_CONFIG.format(HASSIO_SHARE)
 
     @property
     def path_ssl_docker(self):
         """Return SSL path extern for docker."""
-        return HOMEASSISTANT_SSL.format(HASSIO_SHARE_EXT)
+        return HOMEASSISTANT_SSL.format(os.environ['SUPERVISOR_NAME'])
 
     @property
     def path_ssl(self):
         """Return SSL path inside supervisor."""
-        return HOMEASSISTANT_SSL.format(HASSIO_SHARE_INT)
+        return HOMEASSISTANT_SSL.format(HASSIO_SHARE)
diff --git a/hassio_api/hassio/const.py b/hassio_api/hassio/const.py
index f66e40223..0748f7973 100644
--- a/hassio_api/hassio/const.py
+++ b/hassio_api/hassio/const.py
@@ -1,6 +1,4 @@
 """Const file for HassIO."""
-import os
-
 HASSIO_VERSION = '0.3'
 
 URL_HASSIO_VERSION = \
@@ -13,9 +11,7 @@ FILE_HOST_NETWORK = '/boot/network'
 FILE_HASSIO_ADDONS = '/data/addons.json'
 FILE_HASSIO_CONFIG = '/data/config.json'
 
-HASSIO_SHARE_EXT = os.environ['SUPERVISOR_SHARE']
-HASSIO_SHARE_INT = '/data'
-HASSIO_DOCKER = os.environ['SUPERVISOR_NAME']
+HASSIO_SHARE = '/data'
 
 SOCKET_DOCKER = "/var/run/docker.sock"
 SOCKET_HC = "/var/run/hassio-hc.sock"
diff --git a/hassio_api/hassio/dock/supervisor.py b/hassio_api/hassio/dock/supervisor.py
index 1cd206709..72a45a538 100644
--- a/hassio_api/hassio/dock/supervisor.py
+++ b/hassio_api/hassio/dock/supervisor.py
@@ -1,6 +1,7 @@
 """Init file for HassIO docker object."""
+import os
+
 from . import DockerBase
-from ..const import HASSIO_DOCKER
 
 
 class DockerSupervisor(DockerBase):
@@ -9,7 +10,7 @@ class DockerSupervisor(DockerBase):
     @property
     def docker_name(self):
         """Return name of docker container."""
-        return HASSIO_DOCKER
+        return os.environ['SUPERVISOR_NAME']
 
     async def run(self):
         """Run docker image."""