From 31f868e937621b18c0a9a172a82a20ec3ee55210 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Mon, 17 Jan 2022 13:26:36 +0100 Subject: [PATCH] Adapt shebang if no s6 supervision --- addons_updater/rootfs/entrypoint.sh | 2 +- arpspoof/rootfs/entrypoint.sh | 2 +- cloudcommander/rootfs/entrypoint.sh | 2 +- enedisgateway2mqtt/rootfs/entrypoint.sh | 2 +- enedisgateway2mqtt_dev/rootfs/entrypoint.sh | 2 +- filebrowser/rootfs/entrypoint.sh | 2 +- fireflyiii/rootfs/entrypoint.sh | 2 +- fireflyiii_data_importer/rootfs/entrypoint.sh | 2 +- flaresolverr/rootfs/entrypoint.sh | 2 +- gazpar2mqtt/rootfs/entrypoint.sh | 2 +- inadyn/rootfs/entrypoint.sh | 2 +- joal/rootfs/entrypoint.sh | 2 +- joplin/rootfs/entrypoint.sh | 2 +- photoprism/rootfs/entrypoint.sh | 2 +- tandoor_recipes/rootfs/entrypoint.sh | 2 +- webtrees/rootfs/entrypoint.sh | 2 +- whoogle/rootfs/entrypoint.sh | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/addons_updater/rootfs/entrypoint.sh b/addons_updater/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/addons_updater/rootfs/entrypoint.sh +++ b/addons_updater/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/arpspoof/rootfs/entrypoint.sh b/arpspoof/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/arpspoof/rootfs/entrypoint.sh +++ b/arpspoof/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/cloudcommander/rootfs/entrypoint.sh b/cloudcommander/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/cloudcommander/rootfs/entrypoint.sh +++ b/cloudcommander/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/enedisgateway2mqtt/rootfs/entrypoint.sh b/enedisgateway2mqtt/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/enedisgateway2mqtt/rootfs/entrypoint.sh +++ b/enedisgateway2mqtt/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/enedisgateway2mqtt_dev/rootfs/entrypoint.sh b/enedisgateway2mqtt_dev/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/enedisgateway2mqtt_dev/rootfs/entrypoint.sh +++ b/enedisgateway2mqtt_dev/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/filebrowser/rootfs/entrypoint.sh b/filebrowser/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/filebrowser/rootfs/entrypoint.sh +++ b/filebrowser/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/fireflyiii/rootfs/entrypoint.sh b/fireflyiii/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/fireflyiii/rootfs/entrypoint.sh +++ b/fireflyiii/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/fireflyiii_data_importer/rootfs/entrypoint.sh b/fireflyiii_data_importer/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/fireflyiii_data_importer/rootfs/entrypoint.sh +++ b/fireflyiii_data_importer/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/flaresolverr/rootfs/entrypoint.sh b/flaresolverr/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/flaresolverr/rootfs/entrypoint.sh +++ b/flaresolverr/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/gazpar2mqtt/rootfs/entrypoint.sh b/gazpar2mqtt/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/gazpar2mqtt/rootfs/entrypoint.sh +++ b/gazpar2mqtt/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/inadyn/rootfs/entrypoint.sh b/inadyn/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/inadyn/rootfs/entrypoint.sh +++ b/inadyn/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/joal/rootfs/entrypoint.sh b/joal/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/joal/rootfs/entrypoint.sh +++ b/joal/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/joplin/rootfs/entrypoint.sh b/joplin/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/joplin/rootfs/entrypoint.sh +++ b/joplin/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/photoprism/rootfs/entrypoint.sh b/photoprism/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/photoprism/rootfs/entrypoint.sh +++ b/photoprism/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/tandoor_recipes/rootfs/entrypoint.sh b/tandoor_recipes/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/tandoor_recipes/rootfs/entrypoint.sh +++ b/tandoor_recipes/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/webtrees/rootfs/entrypoint.sh b/webtrees/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/webtrees/rootfs/entrypoint.sh +++ b/webtrees/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done diff --git a/whoogle/rootfs/entrypoint.sh b/whoogle/rootfs/entrypoint.sh index f60beeda3..d3ec978b1 100644 --- a/whoogle/rootfs/entrypoint.sh +++ b/whoogle/rootfs/entrypoint.sh @@ -11,6 +11,6 @@ for SCRIPTS in /etc/cont-init.d/*; do chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x "$SCRIPTS" # Change shebang if no s6 supervision - if [ -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi + if [ ! -d /etc/s6 ]; then sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"; fi /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" done