From 5ae2b58a15cd4c7c9c59c8ad4ee2d6b3021a4640 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 16 Dec 2020 16:03:14 +0100 Subject: [PATCH] S6-overlay cleanup for HM & deCONZ (#1717) --- deconz/CHANGELOG.md | 4 ++++ deconz/config.json | 2 +- deconz/rootfs/etc/services.d/nginx/run | 2 +- deconz/rootfs/etc/services.d/otau-deconz/run | 2 +- deconz/rootfs/etc/services.d/otau-ikea/run | 2 +- deconz/rootfs/etc/services.d/otau-ledvance/run | 2 +- deconz/rootfs/etc/services.d/udev/run | 2 +- homematic/CHANGELOG.md | 4 ++++ homematic/config.json | 2 +- homematic/rootfs/etc/services.d/hmserver/run | 2 +- homematic/rootfs/etc/services.d/lighttpd/run | 2 +- homematic/rootfs/etc/services.d/nginx/run | 2 +- homematic/rootfs/etc/services.d/regahss/run | 2 +- homematic/rootfs/etc/services.d/rfd/run | 2 +- homematic/rootfs/etc/services.d/timesync/run | 2 +- homematic/rootfs/etc/services.d/wired/run | 2 +- 16 files changed, 22 insertions(+), 14 deletions(-) diff --git a/deconz/CHANGELOG.md b/deconz/CHANGELOG.md index e43d97c..1222645 100644 --- a/deconz/CHANGELOG.md +++ b/deconz/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 6.6.1 + +- Small cleanup with s6-overlay + ## 6.6.0 - Bump deCONZ to 2.7.1 diff --git a/deconz/config.json b/deconz/config.json index a43f884..6c1d7f2 100644 --- a/deconz/config.json +++ b/deconz/config.json @@ -1,6 +1,6 @@ { "name": "deCONZ", - "version": "6.6.0", + "version": "6.6.1", "slug": "deconz", "description": "Control a Zigbee network with ConBee or RaspBee by Dresden Elektronik", "arch": ["amd64", "armhf", "aarch64"], diff --git a/deconz/rootfs/etc/services.d/nginx/run b/deconz/rootfs/etc/services.d/nginx/run index 24a3cf5..38ef478 100644 --- a/deconz/rootfs/etc/services.d/nginx/run +++ b/deconz/rootfs/etc/services.d/nginx/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Start NGINX service # ============================================================================== diff --git a/deconz/rootfs/etc/services.d/otau-deconz/run b/deconz/rootfs/etc/services.d/otau-deconz/run index c0d07cf..109535e 100644 --- a/deconz/rootfs/etc/services.d/otau-deconz/run +++ b/deconz/rootfs/etc/services.d/otau-deconz/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Download available firmware update for IKEA # ============================================================================== diff --git a/deconz/rootfs/etc/services.d/otau-ikea/run b/deconz/rootfs/etc/services.d/otau-ikea/run index 838f86e..922a063 100644 --- a/deconz/rootfs/etc/services.d/otau-ikea/run +++ b/deconz/rootfs/etc/services.d/otau-ikea/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Download available firmware update for IKEA # ============================================================================== diff --git a/deconz/rootfs/etc/services.d/otau-ledvance/run b/deconz/rootfs/etc/services.d/otau-ledvance/run index eae37f9..1697f39 100644 --- a/deconz/rootfs/etc/services.d/otau-ledvance/run +++ b/deconz/rootfs/etc/services.d/otau-ledvance/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Download available firmware update for OSRAM Ledvance # ============================================================================== diff --git a/deconz/rootfs/etc/services.d/udev/run b/deconz/rootfs/etc/services.d/udev/run index b90a0b4..fe1ea3c 100644 --- a/deconz/rootfs/etc/services.d/udev/run +++ b/deconz/rootfs/etc/services.d/udev/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Start udevd service # ============================================================================== diff --git a/homematic/CHANGELOG.md b/homematic/CHANGELOG.md index 9078890..e99f513 100644 --- a/homematic/CHANGELOG.md +++ b/homematic/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 11.0.1 + +- Small cleanup with s6-overlay + ## 11.0.0 - Migrate to s6-overlay & tempio diff --git a/homematic/config.json b/homematic/config.json index db3d30b..0143c2c 100644 --- a/homematic/config.json +++ b/homematic/config.json @@ -1,6 +1,6 @@ { "name": "HomeMatic CCU", - "version": "11.0.0", + "version": "11.0.1", "slug": "homematic", "description": "HomeMatic central based on OCCU", "url": "https://github.com/home-assistant/hassio-addons/tree/master/homematic", diff --git a/homematic/rootfs/etc/services.d/hmserver/run b/homematic/rootfs/etc/services.d/hmserver/run index 0de97f2..9b4b5f7 100644 --- a/homematic/rootfs/etc/services.d/hmserver/run +++ b/homematic/rootfs/etc/services.d/hmserver/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Start HomeMatic HMServer service # ============================================================================== diff --git a/homematic/rootfs/etc/services.d/lighttpd/run b/homematic/rootfs/etc/services.d/lighttpd/run index b18efea..936fd12 100644 --- a/homematic/rootfs/etc/services.d/lighttpd/run +++ b/homematic/rootfs/etc/services.d/lighttpd/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Start light httpd service # ============================================================================== diff --git a/homematic/rootfs/etc/services.d/nginx/run b/homematic/rootfs/etc/services.d/nginx/run index 2b9b8e0..964bc41 100644 --- a/homematic/rootfs/etc/services.d/nginx/run +++ b/homematic/rootfs/etc/services.d/nginx/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Start NGINX service # ============================================================================== diff --git a/homematic/rootfs/etc/services.d/regahss/run b/homematic/rootfs/etc/services.d/regahss/run index 75827bd..396d38d 100644 --- a/homematic/rootfs/etc/services.d/regahss/run +++ b/homematic/rootfs/etc/services.d/regahss/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Start ReGaHss service # ============================================================================== diff --git a/homematic/rootfs/etc/services.d/rfd/run b/homematic/rootfs/etc/services.d/rfd/run index 0653dcd..6403d6f 100644 --- a/homematic/rootfs/etc/services.d/rfd/run +++ b/homematic/rootfs/etc/services.d/rfd/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Start HomeMatic RFD service # ============================================================================== diff --git a/homematic/rootfs/etc/services.d/timesync/run b/homematic/rootfs/etc/services.d/timesync/run index 62138a9..d20650d 100644 --- a/homematic/rootfs/etc/services.d/timesync/run +++ b/homematic/rootfs/etc/services.d/timesync/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Start HomeMatic RF timesync service # ============================================================================== diff --git a/homematic/rootfs/etc/services.d/wired/run b/homematic/rootfs/etc/services.d/wired/run index 6a6fe0b..e8ac643 100644 --- a/homematic/rootfs/etc/services.d/wired/run +++ b/homematic/rootfs/etc/services.d/wired/run @@ -1,4 +1,4 @@ -#!/usr/bin/env bashio +#!/usr/bin/with-contenv bashio # ============================================================================== # Start HomeMatic wired service # ==============================================================================