From 5114a557b75adb68b99f9a72b5005a18947e02bf Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Thu, 13 Jan 2022 22:57:35 +0100
Subject: [PATCH] Update 00-aaa_dockerfile_backup.sh

---
 zzz_templates/00-aaa_dockerfile_backup.sh | 39 ++++++++++++-----------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/zzz_templates/00-aaa_dockerfile_backup.sh b/zzz_templates/00-aaa_dockerfile_backup.sh
index c8646f882..6c582f7a6 100644
--- a/zzz_templates/00-aaa_dockerfile_backup.sh
+++ b/zzz_templates/00-aaa_dockerfile_backup.sh
@@ -1,23 +1,6 @@
-#!/bin/bash 
+#!/bin/bash
+
 # If dockerfile failed install manually
-if [ -e "/ENVFILE" ]; then
-    echo "Executing script"
-    PACKAGES=$(</ENVFILE)
-    (
-        #######################
-        # Automatic installer #
-        #######################
-        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); 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); fi &&
-            curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh &&
-            chmod 777 /automatic_packages.sh &&
-            eval /./automatic_packages.sh "$PACKAGES" &&
-            rm /automatic_packages.sh
-
-    ) >/dev/null
-
-fi
-
 if [ -e "/MODULESFILE" ]; then
     echo "Executing modules script"
     PACKAGES=$(</MODULESFILE)
@@ -39,3 +22,21 @@ if [ -e "/MODULESFILE" ]; then
     ) >/dev/null
 
 fi
+
+if [ -e "/ENVFILE" ]; then
+    echo "Executing script"
+    PACKAGES=$(</ENVFILE)
+    (
+        #######################
+        # Automatic installer #
+        #######################
+        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); 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); fi &&
+            curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh &&
+            chmod 777 /automatic_packages.sh &&
+            eval /./automatic_packages.sh "$PACKAGES" &&
+            rm /automatic_packages.sh
+
+    ) >/dev/null
+
+fi