From 465a6156f7747bc6e2dbcd6202ccd17a9afff331 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@frenck.nl>
Date: Sat, 20 Apr 2019 14:21:08 +0200
Subject: [PATCH] :hammer: Refactor of init scripts (#15)

---
 .../etc/cont-init.d/20-configuration.sh       | 19 -------------------
 .../{10-requirements.sh => chrony.sh}         | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 chrony/rootfs/etc/cont-init.d/20-configuration.sh
 rename chrony/rootfs/etc/cont-init.d/{10-requirements.sh => chrony.sh} (74%)

diff --git a/chrony/rootfs/etc/cont-init.d/20-configuration.sh b/chrony/rootfs/etc/cont-init.d/20-configuration.sh
deleted file mode 100644
index 2d6fbee..0000000
--- a/chrony/rootfs/etc/cont-init.d/20-configuration.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: chrony
-# This file configures the conf file from the options set
-# ==============================================================================
-readonly CHRONY_CONF='/etc/chrony/chrony.conf'
-declare mode
-declare -a serverlist
-
-mode=$(bashio::config 'mode')
-bashio::log.debug "Running in NTP mode: ${mode}"
-
-for server in $(bashio::config "ntp_${mode}"); do
-    bashio::log.debug "Adding server ${server}"
-    echo "${mode} ${server} iburst" >> ${CHRONY_CONF}
-    serverlist+=("${server}")
-done
-
-echo "initstepslew 10 ${serverlist[*]}" >> ${CHRONY_CONF}
diff --git a/chrony/rootfs/etc/cont-init.d/10-requirements.sh b/chrony/rootfs/etc/cont-init.d/chrony.sh
similarity index 74%
rename from chrony/rootfs/etc/cont-init.d/10-requirements.sh
rename to chrony/rootfs/etc/cont-init.d/chrony.sh
index 6652211..27ef912 100644
--- a/chrony/rootfs/etc/cont-init.d/10-requirements.sh
+++ b/chrony/rootfs/etc/cont-init.d/chrony.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: chrony
-# This files check if all user configuration requirements are met
+# Configures chrony
 # ==============================================================================
+readonly CHRONY_CONF='/etc/chrony/chrony.conf'
+declare mode
+declare -a serverlist
 
 # Check running mode
 if bashio::config.equals 'mode' 'pool' \
@@ -36,3 +39,14 @@ then
     bashio::log.fatal
     bashio::exit.nok
 fi
+
+# Write configuration file
+mode=$(bashio::config 'mode')
+bashio::log.debug "Running in NTP mode: ${mode}"
+for server in $(bashio::config "ntp_${mode}"); do
+    bashio::log.debug "Adding server ${server}"
+    echo "${mode} ${server} iburst" >> ${CHRONY_CONF}
+    serverlist+=("${server}")
+done
+
+echo "initstepslew 10 ${serverlist[*]}" >> ${CHRONY_CONF}