Entrypoint modification

2026-01-10 09:51:02 +01:00 · 2023-09-09 09:20:16 +02:00
parent 643f8cbad0
commit c97e1007e1
81 changed files with 567 additions and 244 deletions
--- a/addons_updater/Dockerfile
+++ b/addons_updater/Dockerfile
@@ -66,9 +66,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 # Entrypoint logic

--- a/arpspoof/Dockerfile
+++ b/arpspoof/Dockerfile
@@ -66,9 +66,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/autobrr/Dockerfile
+++ b/autobrr/Dockerfile
@@ -92,9 +92,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #WORKDIR /
 ENTRYPOINT [ "/usr/bin/env" ]
--- a/baikal/Dockerfile
+++ b/baikal/Dockerfile
@@ -70,9 +70,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 WORKDIR "/data"

--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -89,9 +89,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ############
 # 5 Labels #
--- a/binance-trading-bot/Dockerfile
+++ b/binance-trading-bot/Dockerfile
@@ -86,9 +86,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 VOLUME [ "/data" ]
 WORKDIR /
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -76,9 +76,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 RUN chmod 777 /etc/services.d/*/*

--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -94,9 +94,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/browserless_chrome/Dockerfile
+++ b/browserless_chrome/Dockerfile
@@ -70,9 +70,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ############
 # 5 Labels #
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -95,11 +95,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

-#
 #WORKDIR /
 #ENTRYPOINT [ "/usr/bin/env" ]
 #CMD [ "/ha_entrypoint.sh" ]
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -103,9 +103,13 @@ RUN if ! command -v sqlite3 >/dev/null 2>/dev/null; then (apt-get update && apt-
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -68,9 +68,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ENTRYPOINT [ "/ha_entrypoint.sh" ]

--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -89,9 +89,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -78,9 +78,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ############
 # 5 Labels #
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -88,9 +88,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ############
 # 5 Labels #
--- a/enedisgateway2mqtt/Dockerfile
+++ b/enedisgateway2mqtt/Dockerfile
@@ -65,9 +65,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/enedisgateway2mqtt_dev/Dockerfile
+++ b/enedisgateway2mqtt_dev/Dockerfile
@@ -65,9 +65,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/epicgamesfree/Dockerfile
+++ b/epicgamesfree/Dockerfile
@@ -67,9 +67,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -67,9 +67,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 VOLUME [ "/data" ]
 WORKDIR /
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -76,9 +76,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/fireflyiii_data_importer/Dockerfile
+++ b/fireflyiii_data_importer/Dockerfile
@@ -72,9 +72,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/fireflyiii_fints_importer/Dockerfile
+++ b/fireflyiii_fints_importer/Dockerfile
@@ -66,9 +66,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/flaresolverr/Dockerfile
+++ b/flaresolverr/Dockerfile
@@ -66,9 +66,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -100,9 +100,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/free_games_claimer/Dockerfile
+++ b/free_games_claimer/Dockerfile
@@ -65,9 +65,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 RUN \
    # Change data folder
--- a/gazpar2mqtt/Dockerfile
+++ b/gazpar2mqtt/Dockerfile
@@ -67,9 +67,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/gitea/Dockerfile
+++ b/gitea/Dockerfile
@@ -69,9 +69,13 @@ EXPOSE 22 3000
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/ha_entrypoint.sh" ]
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -92,9 +92,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ############
 # 5 Labels #
--- a/guacamole/Dockerfile
+++ b/guacamole/Dockerfile
@@ -97,9 +97,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /data
--- a/immich/Dockerfile
+++ b/immich/Dockerfile
@@ -107,9 +107,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #ENTRYPOINT [ "/usr/bin/env" ]
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -90,9 +90,13 @@ RUN apk add --no-cache \
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 WORKDIR /

--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -91,9 +91,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ############
 # 5 Labels #
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -96,9 +96,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/jellyseerr/Dockerfile
+++ b/jellyseerr/Dockerfile
@@ -73,9 +73,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -78,9 +78,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/joplin/Dockerfile
+++ b/joplin/Dockerfile
@@ -72,9 +72,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -91,9 +91,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/mealie/Dockerfile
+++ b/mealie/Dockerfile
@@ -73,9 +73,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 RUN \
    # Add custom instructions to run.sh on armv7
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -88,9 +88,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -124,9 +124,13 @@ VOLUME ["/share", "/ssl", "/data", "/media"]
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 # Correct modifications
 ARG CONFIGLOCATION="/www/nextcloud/config"
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -88,9 +88,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/omada/Dockerfile
+++ b/omada/Dockerfile
@@ -73,9 +73,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #ENTRYPOINT [ "/usr/bin/env" ]
--- a/omada_v3/Dockerfile
+++ b/omada_v3/Dockerfile
@@ -74,9 +74,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #ENTRYPOINT [ "/usr/bin/env" ]
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -88,9 +88,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -88,9 +88,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ############
 # 5 Labels #
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -89,9 +89,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/Dockerfile
@@ -70,9 +70,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 #WORKDIR /
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -98,9 +98,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -77,9 +77,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -90,9 +90,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 # hadolint ignore=SC2013
 RUN \
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -100,9 +100,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/plex_meta_manager/Dockerfile
+++ b/plex_meta_manager/Dockerfile
@@ -96,9 +96,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/portainer/Dockerfile
+++ b/portainer/Dockerfile
@@ -88,9 +88,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 RUN chmod 777 /etc/services.d/*/*
 #
--- a/portainer_agent/Dockerfile
+++ b/portainer_agent/Dockerfile
@@ -74,9 +74,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 RUN chmod a+x /usr/sbin/healthcheck && \
    chmod a+x /usr/sbin/wait-for-signal
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -70,9 +70,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 WORKDIR /data
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -91,9 +91,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -126,9 +126,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ############
 # 5 Labels #
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -92,9 +92,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -89,9 +89,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -91,9 +91,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -111,9 +111,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/sabnzbd/Dockerfile
+++ b/sabnzbd/Dockerfile
@@ -88,9 +88,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -68,9 +68,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh



--- a/scrutiny_fa/Dockerfile
+++ b/scrutiny_fa/Dockerfile
@@ -68,9 +68,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh



--- a/seafile/Dockerfile
+++ b/seafile/Dockerfile
@@ -70,9 +70,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -92,9 +92,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/sponsorblockcast/Dockerfile
+++ b/sponsorblockcast/Dockerfile
@@ -67,9 +67,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 # Entrypoint logic

--- a/spotweb/Dockerfile
+++ b/spotweb/Dockerfile
@@ -123,9 +123,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ############
 # 5 Labels #
--- a/tandoor_recipes/Dockerfile
+++ b/tandoor_recipes/Dockerfile
@@ -64,9 +64,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 #WORKDIR /data/recipes
--- a/tdarr/Dockerfile
+++ b/tdarr/Dockerfile
@@ -65,9 +65,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ############
 # 5 Labels #
--- a/teamspeak/Dockerfile
+++ b/teamspeak/Dockerfile
@@ -71,9 +71,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -100,9 +100,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -93,9 +93,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 CMD [ "/ha_entrypoint.sh" ]
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -101,9 +101,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/unpackerr/Dockerfile
+++ b/unpackerr/Dockerfile
@@ -87,9 +87,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 ############
 # 5 Labels #
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -98,9 +98,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -78,9 +78,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/wger/Dockerfile
+++ b/wger/Dockerfile
@@ -75,9 +75,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 USER wger
--- a/whoogle/Dockerfile
+++ b/whoogle/Dockerfile
@@ -70,9 +70,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]
--- a/xteve/Dockerfile
+++ b/xteve/Dockerfile
@@ -70,9 +70,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh

 #
 #WORKDIR /
--- a/zoneminder/Dockerfile
+++ b/zoneminder/Dockerfile
@@ -75,9 +75,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # Add entrypoint
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

-# Corrects permissions for s6 v3
-RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
-    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi
+# Entrypoint modifications
+RUN \
+    # Corrects permissions for s6 v3
+    if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
+    #Correct shebang in entrypoint
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/bin/bash" "/bin/sh"; do [[ -f "${shebang%% *}" ]] && break; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh


 ENTRYPOINT [ "/usr/bin/env" ]