From 4a9cdd344e0afd53d3c191db284bffc5ca353001 Mon Sep 17 00:00:00 2001
From: ludeeus <joasoe@gmail.com>
Date: Sun, 24 Mar 2019 13:58:20 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Rewrite=20to=20use=20bashio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rootfs/etc/cont-init.d/10-requirements.sh | 22 ++-----------------
 phlex/rootfs/etc/cont-init.d/20-phlex.sh      |  6 ++---
 phlex/rootfs/etc/cont-init.d/30-nginx.sh      | 12 +++++-----
 phlex/rootfs/etc/services.d/nginx/run         |  6 ++---
 phlex/rootfs/etc/services.d/php-fpm/run       |  2 --
 5 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/phlex/rootfs/etc/cont-init.d/10-requirements.sh b/phlex/rootfs/etc/cont-init.d/10-requirements.sh
index 81acd22..9fdcf9f 100644
--- a/phlex/rootfs/etc/cont-init.d/10-requirements.sh
+++ b/phlex/rootfs/etc/cont-init.d/10-requirements.sh
@@ -1,26 +1,8 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: Phlex
 # This files check if all user configuration requirements are met
 # ==============================================================================
-# shellcheck disable=SC1091
-source /usr/lib/hassio-addons/base.sh
 
 # Check SSL requirements, if enabled
-if hass.config.true 'ssl'; then
-    if ! hass.config.has_value 'certfile'; then
-        hass.die 'SSL is enabled, but no certfile was specified'
-    fi
-
-    if ! hass.config.has_value 'keyfile'; then
-        hass.die 'SSL is enabled, but no keyfile was specified'
-    fi
-
-    if ! hass.file_exists "/ssl/$(hass.config.get 'certfile')"; then
-        hass.die 'The configured certfile is not found'
-    fi
-
-    if ! hass.file_exists "/ssl/$(hass.config.get 'keyfile')"; then
-        hass.die 'The configured keyfile is not found'
-    fi
-fi
\ No newline at end of file
+bashio::config.require.ssl 'ssl' 'certfile' 'keyfile'
\ No newline at end of file
diff --git a/phlex/rootfs/etc/cont-init.d/20-phlex.sh b/phlex/rootfs/etc/cont-init.d/20-phlex.sh
index b948def..9d60944 100644
--- a/phlex/rootfs/etc/cont-init.d/20-phlex.sh
+++ b/phlex/rootfs/etc/cont-init.d/20-phlex.sh
@@ -1,12 +1,10 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: Phlex
 # Configures Phlex
 # ==============================================================================
-# shellcheck disable=SC1091
-source /usr/lib/hassio-addons/base.sh
 
-if ! hass.file_exists '/data/config.php'; then
+if ! bashio::fs.file_exists '/data/config.php'; then
     cp /opt/default_config.php /data/config.php
 fi
 
diff --git a/phlex/rootfs/etc/cont-init.d/30-nginx.sh b/phlex/rootfs/etc/cont-init.d/30-nginx.sh
index a3f2e4a..4b587dd 100644
--- a/phlex/rootfs/etc/cont-init.d/30-nginx.sh
+++ b/phlex/rootfs/etc/cont-init.d/30-nginx.sh
@@ -1,28 +1,26 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: Phlex
 # Configures NGINX for use with Phlex
 # ==============================================================================
-# shellcheck disable=SC1091
-source /usr/lib/hassio-addons/base.sh
 
 declare certfile
 declare keyfile
 
 # Enable SSL
-if hass.config.true 'ssl'; then
+if bashio::config.true 'ssl'; then
     rm /etc/nginx/nginx.conf
     mv /etc/nginx/nginx-ssl.conf /etc/nginx/nginx.conf
 
-    certfile=$(hass.config.get 'certfile')
-    keyfile=$(hass.config.get 'keyfile')
+    certfile=$(bashio::.config 'certfile')
+    keyfile=$(bashio::.config 'keyfile')
 
     sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/nginx.conf
     sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/nginx.conf
 fi
 
 # Disables IPv6 in case its disabled by the user
-if ! hass.config.true 'ipv6'; then
+if ! bashio::config.true 'ipv6'; then
     sed -i '/listen \[::\].*/ d' /etc/nginx/nginx.conf
 fi
 
diff --git a/phlex/rootfs/etc/services.d/nginx/run b/phlex/rootfs/etc/services.d/nginx/run
index b479cb8..304fb19 100644
--- a/phlex/rootfs/etc/services.d/nginx/run
+++ b/phlex/rootfs/etc/services.d/nginx/run
@@ -1,13 +1,11 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: Phlex
 # Runs the NGINX daemon
 # ==============================================================================
-# shellcheck disable=SC1091
-source /usr/lib/hassio-addons/base.sh
 
 # Wait for PHP-FPM to become available
 s6-svwait -u -t 5000 /var/run/s6/services/php-fpm
 
-hass.log.info "Starting Phlex..."
+bashio::log.info "Starting Phlex..."
 exec nginx -g "daemon off;"
diff --git a/phlex/rootfs/etc/services.d/php-fpm/run b/phlex/rootfs/etc/services.d/php-fpm/run
index 5655b5c..3de4710 100644
--- a/phlex/rootfs/etc/services.d/php-fpm/run
+++ b/phlex/rootfs/etc/services.d/php-fpm/run
@@ -3,7 +3,5 @@
 # Community Hass.io Add-ons: Phlex
 # Runs the PHP-FPM daemon
 # ==============================================================================
-# shellcheck disable=SC1091
-source /usr/lib/hassio-addons/base.sh
 
 exec php-fpm7 --nodaemonize