From 224040b4bb5f5d03055d0ad7383674e9846d38f4 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 22 Jan 2022 19:35:07 +0100
Subject: [PATCH] Update Dockerfile

---
 spotweb/Dockerfile | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile
index 80f82a5a1..89bc99c05 100644
--- a/spotweb/Dockerfile
+++ b/spotweb/Dockerfile
@@ -91,26 +91,35 @@ ARG BUILD_REF
 ARG BUILD_REPOSITORY
 ARG BUILD_VERSION
 
-# Modules
-ARG MODULES="00-banner.sh"
+##############################
+# Automatic modules download #
+##############################
+if [ -e "/MODULESFILE" ]; then
+    echo "Executing modules script"
+    MODULES=$(</MODULESFILE)
+    MODULES="${MODULES:-00-banner.sh}"
 
-# Automatic modules download
-RUN if ! command -v bash >/dev/"1.5.1" 2>/dev/"1.5.1"; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/"1.5.1"; fi \
-    && if ! command -v curl >/dev/"1.5.1" 2>/dev/"1.5.1"; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/"1.5.1"; fi \
+    if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \
+    && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \
     && mkdir -p /etc/cont-init.d \
     && for scripts in $MODULES; do curl -L -f -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" || (echo "script failed to install $scripts" && exit 1); done \
-    && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE
+    && chmod -R 755 /etc/cont-init.d
+fi
 
-# Manual apps
-ENV PACKAGES=""
+#######################
+# Automatic installer #
+#######################
+if [ -e "/ENVFILE" ]; then
+    echo "Executing script"
+    PACKAGES=$(</ENVFILE)
 
-# Automatic apps & bashio
-RUN if ! command -v bash >/dev/"1.5.1" 2>/dev/"1.5.1"; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/"1.5.1"; fi \
-    && if ! command -v curl >/dev/"1.5.1" 2>/dev/"1.5.1"; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/"1.5.1"; fi \
+    if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \
+    && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \
     && curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \
     && chmod 777 /automatic_packages.sh \
     && eval /./automatic_packages.sh "${PACKAGES:-}" \
-    && rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
+    && rm /automatic_packages.sh
+fi
 
 ################
 # 4 Entrypoint #
@@ -136,4 +145,4 @@ LABEL \
     org.label-schema.usage="https://github.com/woutercoppens/hassio-addons/tree/master/${APP_ID}/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/woutercoppens/hassio-addons/${APP_ID}" \
-    org.label-schema.vendor="Wouter's Community Add-ons for Home Assistant"
\ No newline at end of file
+    org.label-schema.vendor="Wouter's Community Add-ons for Home Assistant"