From f9203d5cb4a4b555370ad6e0bfcbfa3a345df118 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Mon, 15 Nov 2021 11:49:41 +0100
Subject: [PATCH] Entrypoint udpate

---
 cloudcommander/rootfs/entrypoint.sh     | 14 +++++++-------
 enedisgateway2mqtt/rootfs/entrypoint.sh | 14 +++++++-------
 filebrowser/rootfs/entrypoint.sh        | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/cloudcommander/rootfs/entrypoint.sh b/cloudcommander/rootfs/entrypoint.sh
index 9a2e5e13b..015dd84c9 100644
--- a/cloudcommander/rootfs/entrypoint.sh
+++ b/cloudcommander/rootfs/entrypoint.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-cd /scripts
-for SCRIPTS in *; do
-  [ -e "$SCRIPTS" ] || continue 
-  echo $SCRIPTS
+#!/bin/bash
+
+echo "Starting scripts :"
+for SCRIPTS in scripts/*; do
+  [ -e "$SCRIPTS" ] || continue
+  echo "$SCRIPTS: executing"
   chown $(id -u):$(id -g) $SCRIPTS
   chmod a+x $SCRIPTS
   sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
-  ./$SCRIPTS &&
-  true || true # Prevents script crash on failure
-  echo "exit $?"
+  ./$SCRIPTS || echo "$SCRIPTS: exiting $?"
 done
diff --git a/enedisgateway2mqtt/rootfs/entrypoint.sh b/enedisgateway2mqtt/rootfs/entrypoint.sh
index 9a2e5e13b..015dd84c9 100644
--- a/enedisgateway2mqtt/rootfs/entrypoint.sh
+++ b/enedisgateway2mqtt/rootfs/entrypoint.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-cd /scripts
-for SCRIPTS in *; do
-  [ -e "$SCRIPTS" ] || continue 
-  echo $SCRIPTS
+#!/bin/bash
+
+echo "Starting scripts :"
+for SCRIPTS in scripts/*; do
+  [ -e "$SCRIPTS" ] || continue
+  echo "$SCRIPTS: executing"
   chown $(id -u):$(id -g) $SCRIPTS
   chmod a+x $SCRIPTS
   sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
-  ./$SCRIPTS &&
-  true || true # Prevents script crash on failure
-  echo "exit $?"
+  ./$SCRIPTS || echo "$SCRIPTS: exiting $?"
 done
diff --git a/filebrowser/rootfs/entrypoint.sh b/filebrowser/rootfs/entrypoint.sh
index 9a2e5e13b..015dd84c9 100644
--- a/filebrowser/rootfs/entrypoint.sh
+++ b/filebrowser/rootfs/entrypoint.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-cd /scripts
-for SCRIPTS in *; do
-  [ -e "$SCRIPTS" ] || continue 
-  echo $SCRIPTS
+#!/bin/bash
+
+echo "Starting scripts :"
+for SCRIPTS in scripts/*; do
+  [ -e "$SCRIPTS" ] || continue
+  echo "$SCRIPTS: executing"
   chown $(id -u):$(id -g) $SCRIPTS
   chmod a+x $SCRIPTS
   sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' $SCRIPTS || true
-  ./$SCRIPTS &&
-  true || true # Prevents script crash on failure
-  echo "exit $?"
+  ./$SCRIPTS || echo "$SCRIPTS: exiting $?"
 done