align to cont-init.d

fireflyiii/rootfs/entrypoint.sh

@@ -5,7 +5,7 @@ echo "Starting..."
 # Starting scripts #
 ####################
 
-for SCRIPTS in /scripts/*; do
+for SCRIPTS in /etc/cont-init.d/*; do
   [ -e "$SCRIPTS" ] || continue
   echo "$SCRIPTS: executing"
   chown "$(id -u)":"$(id -g)" "$SCRIPTS"

fireflyiii/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -12,7 +12,6 @@ if [ -e "/MODULESFILE" ]; then
             mkdir -p /tmpscripts /etc/cont-init.d &&
             for scripts in $MODULES; do curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/$scripts" -o /tmpscripts/"$scripts"; done &&
             if [ -d /etc/cont-init.d ]; then /bin/cp -rf /tmpscripts/* /etc/cont-init.d/ && chmod -R 755 /etc/cont-init.d; fi &&
-            if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi &&
             rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE
     ) >/dev/null
 

fireflyiii/rootfs/etc/cont-init.d/00-global_var.sh

@@ -19,7 +19,7 @@ for KEYS in "${arr[@]}"; do
   export $line
   # Export the variable to run scripts
   line="${KEYS}=${VALUE//[\"\']/} &>/dev/null"
-  sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run*
+  sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null
 done
 
 ################
@@ -31,4 +31,3 @@ if [ ! -z "TZ" ] && [ -f /etc/localtime ]; then
     ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" >/etc/timezone
   fi
 fi
-

fireflyiii/rootfs/etc/cont-init.d/92-config_yaml.sh

@@ -45,10 +45,10 @@ function parse_yaml {
     local prefix=$2 || local prefix=""
     local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @ | tr @ '\034')
     sed -ne "s|^\($s\):|\1|" \
-    -e "s| #.*$||g" \
-    -e "s|#.*$||g" \
-    -e "s|^\($s\)\($w\)$s:$s[\"']\(.*\)[\"']$s\$|\1$fs\2$fs\3|p" \
-    -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" $1 |
+        -e "s| #.*$||g" \
+        -e "s|#.*$||g" \
+        -e "s|^\($s\)\($w\)$s:$s[\"']\(.*\)[\"']$s\$|\1$fs\2$fs\3|p" \
+        -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" $1 |
         awk -F$fs '{
       indent = length($1)/2;
       vname[indent] = $2;
@@ -84,7 +84,6 @@ while IFS= read -r line; do
         export $line
         # Export the variable
         sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || true
-        sed -i "1a export $line" /scripts/*run* 2>/dev/null || true
         # Show in log
         if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
     else