Align folders with updated upstream name

myelectricaldata/rootfs/entrypoint.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+echo "Starting..."
+
+############################
+# Backup Dockerfile Script #
+############################
+
+if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then
+    chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh
+    chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh
+    /./etc/cont-init.d/00-aaa_dockerfile_backup.sh
+    rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh
+fi
+
+####################
+# Starting scripts #
+####################
+
+for SCRIPTS in /etc/cont-init.d/*; do
+    [ -e "$SCRIPTS" ] || continue
+    echo "$SCRIPTS: executing"
+    chown "$(id -u)":"$(id -g)" "$SCRIPTS"
+    chmod a+x "$SCRIPTS"
+    # Change shebang if no s6 supervision
+    sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
+    /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+done

myelectricaldata/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/with-contenv bashio
+# shellcheck shell=bash
+# shellcheck disable=SC2155
+
+#####################
+# Autodiscover mqtt #
+#####################
+
+if bashio::config.true 'mqtt_autodiscover'; then
+    bashio::log.info "mqtt_autodiscover is defined in options, attempting autodiscovery..."
+    # Check if available
+    if ! bashio::services.available "mqtt"; then bashio::exit.nok "No internal MQTT service found. Please install Mosquitto broker"; fi
+    # Get variables
+    bashio::log.info "... MQTT service found, fetching server detail (you can enter those manually in your config file) ..."
+    export MQTT_HOST=$(bashio::services mqtt "host")
+    export MQTT_PORT=$(bashio::services mqtt "port")
+    export MQTT_SSL=$(bashio::services mqtt "ssl")
+    export MQTT_USERNAME=$(bashio::services mqtt "username")
+    export MQTT_PASSWORD=$(bashio::services mqtt "password")
+    # Export variables
+    for variables in "MQTT_HOST=$MQTT_HOST" "MQTT_PORT=$MQTT_PORT" "MQTT_SSL=$MQTT_SSL" "MQTT_USERNAME=$MQTT_USERNAME" "MQTT_PASSWORD=$MQTT_PASSWORD"; do
+        sed -i "1a export $variables" /etc/services.d/*/*run* 2>/dev/null
+        # Log
+        bashio::log.blue "$variables"
+    done
+fi

myelectricaldata/rootfs/etc/cont-init.d/99-run.sh

@@ -0,0 +1,78 @@
+#!/usr/bin/env bashio
+# shellcheck shell=bash
+
+##################
+# INITIALIZATION #
+##################
+
+# Where is the config
+CONFIGSOURCE=$(bashio::config "CONFIG_LOCATION")
+DATABASESOURCE="$(dirname "${CONFIGSOURCE}")/enedisgateway.db"
+
+# Make sure folder exist
+mkdir -p "$(dirname "${CONFIGSOURCE}")"
+mkdir -p "$(dirname "${DATABASESOURCE}")"
+
+# Check absence of config file
+if [ -f /data/config.yaml ] && [ ! -L /data/config.yaml ]; then
+    bashio::log.warning "A current config was found in /data, it is backuped to ${CONFIGSOURCE}.bak"
+    mv /data/config.yaml "$CONFIGSOURCE".bak
+fi
+
+# Check if config file is there, or create one from template
+if [ -f "$CONFIGSOURCE" ]; then
+    # Create symlink if not existing yet
+    [ ! -L /data/config.yaml ] && ln -sf "$CONFIGSOURCE" /data
+    bashio::log.info "Using config file found in $CONFIGSOURCE"
+
+    # Check if yaml is valid
+    EXIT_CODE=0
+    yamllint -d relaxed "$CONFIGSOURCE" &>ERROR || EXIT_CODE=$?
+    if [ "$EXIT_CODE" = 0 ]; then
+        echo "Config file is a valid yaml"
+    else
+        cat ERROR
+        bashio::log.fatal "Config file has an invalid yaml format. Please check the file in $CONFIGSOURCE. Errors list above. You can check yaml validity with the online tool yamllint.com"
+        bashio::exit.nok
+    fi
+else
+    # Create symlink for addon to create config
+    touch "${CONFIGSOURCE}"
+    ln -sf "$CONFIGSOURCE" /data
+    rm "$CONFIGSOURCE"
+    # Need to restart
+    bashio::log.fatal "Config file not found. The addon will create a new one, then stop. Please customize the file in $CONFIGSOURCE before restarting."
+fi
+
+# Remove previous link or file
+[ -f /data/enedisgateway.db ] && rm /data/enedisgateway.db
+
+# Check if database is here or create symlink
+if [ -f "$DATABASESOURCE" ]; then
+    # Create symlink if not existing yet
+    ln -sf "${DATABASESOURCE}" /data && echo "creating symlink"
+    bashio::log.info "Using database file found in $DATABASESOURCE"
+else
+    # Create symlink for addon to create database
+    touch "${DATABASESOURCE}"
+    ln -sf "$DATABASESOURCE" /data
+    rm "$DATABASESOURCE"
+fi
+
+##############
+# Launch App #
+##############
+echo " "
+bashio::log.info "Starting the app"
+echo " "
+
+# Test mode
+TZ=$(bashio::config "TZ")
+if [ "$TZ" = "test" ]; then
+    echo "secret mode found, launching script in /config/test.sh"
+    cd /config || exit
+    chmod 777 test.sh
+    ./test.sh
+fi
+
+python -u /app/main.py || bashio::log.fatal "The app has crashed. Are you sure you entered the correct config options?"

myelectricaldata/rootfs/templates/config.yaml

@@ -0,0 +1,63 @@
+##########
+# GLOBAL #
+##########
+debug: false
+
+####################
+##      MQTT      ##
+####################
+mqtt:
+  host: MOSQUITO_SERVER # MANDATORY
+  port: 1883
+  username: ""
+  password: ""
+  prefix: enedis_gateway
+  client_id: enedis_gateway
+  retain: true
+  qos: 0
+
+####################
+## Home assistant ##
+####################
+home_assistant:
+  discovery: false
+  discovery_prefix: homeassistant
+  card_myenedis: false
+
+###############
+## Influx DB ##
+###############
+#influxdb:
+#  host: MY_INFLUXDB_SERVER
+#  port: 8086
+#  token: MY_TOKEN
+#  org: MY_ORG
+#  bucket: MY_BUCKET
+
+####################
+## ENEDIS GATEWAY ##
+####################
+enedis_gateway:
+  PDL_1: # MANDATORY
+    token: PDL_1_TOKEN # MANDATORY
+    plan: BASE # BASE or HP/HC
+    consumption: true
+    consumption_detail: true
+    consumption_price_hc: 0
+    consumption_price_hp: 0
+    consumption_price_base: 0
+    production: false
+    production_detail: false
+    #    offpeak_hours: ""        # USE ONLY IF YOU WANT OVERLOAD DEFAULT VALUE, Format : 22h36-00h10;01h00-06h00
+    addresses: true
+#  PDL_2:
+#    token: PDL_2_TOKEN
+#    plan: HP/HC
+#    consumption: true
+#    consumption_detail: true
+#    consumption_price_hc: 0.1781
+#    consumption_price_hp: 0.1337
+#    consumption_price_base: 0.1781
+#    production: false
+#    production_detail: false
+#    addresses: true