New logic

cloudcommander/rootfs/entrypoint.sh

@@ -2,34 +2,6 @@
 
 echo "Starting..."
 
-###################################
-# Export all addon options as env #
-###################################
-
-# For all keys in options.json
-JSONSOURCE="/data/options.json"
-
-# Export keys as env variables
-echo "All addon options were exported as variables"
-mapfile -t arr < <(jq -r 'keys[]' ${JSONSOURCE})
-for KEYS in ${arr[@]}; do
-  # export key
-  VALUE=$(jq .$KEYS ${JSONSOURCE})
-  export ${KEYS}=${VALUE//[\"\']/} &>/dev/null
-done
-
-################
-# Set timezone #
-################
-if [ ! -z "TZ" ] && [ -f /etc/localtime ]; then
-  if [ -f /usr/share/zoneinfo/$TZ ]; then
-    echo "Timezone set from $(cat /etc/timezone) to $TZ"
-    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ >/etc/timezone
-  else
-    echo "WARNING : Timezone $TZ is invalid, it will be kept to default value of $(cat /etc/timezone)"
-  fi
-fi
-
 ####################
 # Starting scripts #
 ####################

cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh

@@ -1,29 +1,18 @@
 #!/bin/bash
 # If dockerfile failed install manually
-if [ ! -f "/usr/bin/bashio" ]; then
-    echo "Bashio does not exist, executing script"
+if [ -e "/ENVFILE" ]; then
+    echo "Executing script"
+    PACKAGES=$(</ENVFILE)
     (
-        ################
-        # Install apps #
-        ################
-        PACKAGES="${PACKAGES:="curl"}"
-        
-        apt-get clean \
-        && apt-get update \
-        && apt-get install -y --no-install-recommends ${PACKAGES} 2>/dev/null \
-        || apk add --no-cache ${PACKAGES}
-
-        ###################
-        # Install bashio #
-        ##################
-        
-        mkdir -p /tmp/bashio
-        curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" |
-            tar -xzf - --strip 1 -C /tmp/bashio
-        mv /tmp/bashio/lib /usr/lib/bashio
-        ln -s /usr/lib/bashio/bashio /usr/bin/bashio
-        rm -rf /tmp/bashio
-
+        #######################
+        # 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