From 9c5d79c63e4ec807b4ee7b49f2f2074565d538a2 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@addons.community>
Date: Thu, 18 Apr 2019 22:13:11 +0200
Subject: [PATCH] :hammer: Merged init scripts

---
 motioneye/rootfs/etc/cont-init.d/motion.sh    | 22 -------------------
 motioneye/rootfs/etc/cont-init.d/motioneye.sh | 18 +++++++++++++++
 2 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 motioneye/rootfs/etc/cont-init.d/motion.sh

diff --git a/motioneye/rootfs/etc/cont-init.d/motion.sh b/motioneye/rootfs/etc/cont-init.d/motion.sh
deleted file mode 100644
index ab1cee0..0000000
--- a/motioneye/rootfs/etc/cont-init.d/motion.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: motionEye
-# Configure motion webcontrol access
-# ==============================================================================
-readonly motion='/data/motioneye/motion.conf'
-
-if bashio::config.true 'motion_webcontrol'; then
-    bashio::log.info "Enabling motion webcontrol..."
-    bashio::.log.warning "This opens up an UNSECURE port to the outside world!"
-    bashio::.log.warning "This port has NO SSL & NO AUTHENICATION!"
-    bashio::.log.warning "YOU HAVE BEEN WARNED!"
-    sed -i "s/webcontrol_localhost on/webcontrol_localhost off/" "$motion"
-else
-    sed -i "s/webcontrol_localhost off/webcontrol_localhost on/" "$motion"
-fi
-
-# Creates initial motionEye media folder in case it is non-existing
-if ! bashio::fs.directory_exists '/share/motioneye'; then
-    mkdir -p /share/motioneye \
-        || bashio::exit.nok 'Failed to create initial motionEye media folder'
-fi
diff --git a/motioneye/rootfs/etc/cont-init.d/motioneye.sh b/motioneye/rootfs/etc/cont-init.d/motioneye.sh
index 7042702..8596482 100644
--- a/motioneye/rootfs/etc/cont-init.d/motioneye.sh
+++ b/motioneye/rootfs/etc/cont-init.d/motioneye.sh
@@ -4,6 +4,7 @@
 # Creates initial motionEye configuration in case it is non-existing
 # ==============================================================================
 readonly CONF='/data/motioneye/motioneye.conf'
+readonly MOTION='/data/motioneye/motion.conf'
 
 if ! bashio::fs.directory_exists '/data/motioneye'; then
     cp -R /etc/motioneye/ /data/motioneye/ \
@@ -27,3 +28,20 @@ if bashio::fs.file_exists "${CONF}"; then
         -exec \
             /usr/lib/python2.7/site-packages/motioneye/scripts/migrateconf.sh {} \;
 fi
+
+# Configure motion webcontrol access
+if bashio::config.true 'motion_webcontrol'; then
+    bashio::log.info "Enabling motion webcontrol..."
+    bashio::.log.warning "This opens up an UNSECURE port to the outside world!"
+    bashio::.log.warning "This port has NO SSL & NO AUTHENICATION!"
+    bashio::.log.warning "YOU HAVE BEEN WARNED!"
+    sed -i "s/webcontrol_localhost on/webcontrol_localhost off/" "$MOTION"
+else
+    sed -i "s/webcontrol_localhost off/webcontrol_localhost on/" "$MOTION"
+fi
+
+# Creates initial motionEye media folder in case it is non-existing
+if ! bashio::fs.directory_exists '/share/motioneye'; then
+    mkdir -p /share/motioneye \
+        || bashio::exit.nok 'Failed to create initial motionEye media folder'
+fi