Beautify bash

enedisgateway2mqtt_dev/rootfs/entrypoint.sh

@@ -6,10 +6,10 @@ echo "Starting..."
 ############################
 
 if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then
-  chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh
-  chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh
-  /./etc/cont-init.d/00-aaa_dockerfile_backup.sh
-  rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh
+    chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh
+    chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh
+    /./etc/cont-init.d/00-aaa_dockerfile_backup.sh
+    rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh
 fi
 
 ####################
@@ -17,11 +17,11 @@ fi
 ####################
 
 for SCRIPTS in /etc/cont-init.d/*; do
-  [ -e "$SCRIPTS" ] || continue
-  echo "$SCRIPTS: executing"
-  chown "$(id -u)":"$(id -g)" "$SCRIPTS"
-  chmod a+x "$SCRIPTS"
-  # Change shebang if no s6 supervision
-  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
-  /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
+    [ -e "$SCRIPTS" ] || continue
+    echo "$SCRIPTS: executing"
+    chown "$(id -u)":"$(id -g)" "$SCRIPTS"
+    chmod a+x "$SCRIPTS"
+    # Change shebang if no s6 supervision
+    sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS"
+    /."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
 done

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

@@ -11,10 +11,10 @@ if [ -e "/MODULESFILE" ]; then
     echo "Executing modules script : $MODULES"
 
     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 echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \
-    && chmod -R 755 /etc/cont-init.d
+        && 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 echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \
+        && chmod -R 755 /etc/cont-init.d
 fi
 
 #######################
@@ -25,9 +25,9 @@ if [ -e "/ENVFILE" ]; then
     echo "Executing dependency script with custom elements : $PACKAGES"
 
     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 -f -L -s -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
+        && 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 -f -L -s -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
 fi

enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/99-run.sh

@@ -15,33 +15,33 @@ mkdir -p "$(dirname "${DATABASESOURCE}")"
 
 # Check absence of config file
 if [ -f /data/config.yaml ] && [ ! -L /data/config.yaml ]; then
-  bashio::log.warning "A current config was found in /data, it is backuped to ${CONFIGSOURCE}.bak"
-  mv /data/config.yaml "$CONFIGSOURCE".bak
+    bashio::log.warning "A current config was found in /data, it is backuped to ${CONFIGSOURCE}.bak"
+    mv /data/config.yaml "$CONFIGSOURCE".bak
 fi
 
 # Check if config file is there, or create one from template
 if [ -f "$CONFIGSOURCE" ]; then
-  # Create symlink if not existing yet
-  [ ! -L /data/config.yaml ] && ln -sf "$CONFIGSOURCE" /data
-  bashio::log.info "Using config file found in $CONFIGSOURCE"
+    # Create symlink if not existing yet
+    [ ! -L /data/config.yaml ] && ln -sf "$CONFIGSOURCE" /data
+    bashio::log.info "Using config file found in $CONFIGSOURCE"
 
-  # Check if yaml is valid
-  EXIT_CODE=0
-  yamllint -d relaxed "$CONFIGSOURCE" &>ERROR || EXIT_CODE=$?
-  if [ "$EXIT_CODE" = 0 ]; then
-    echo "Config file is a valid yaml"
-  else
-    cat ERROR
-    bashio::log.fatal "Config file has an invalid yaml format. Please check the file in $CONFIGSOURCE. Errors list above. You can check yaml validity with the online tool yamllint.com"
-    bashio::exit.nok
-  fi
+    # Check if yaml is valid
+    EXIT_CODE=0
+    yamllint -d relaxed "$CONFIGSOURCE" &>ERROR || EXIT_CODE=$?
+    if [ "$EXIT_CODE" = 0 ]; then
+        echo "Config file is a valid yaml"
+    else
+        cat ERROR
+        bashio::log.fatal "Config file has an invalid yaml format. Please check the file in $CONFIGSOURCE. Errors list above. You can check yaml validity with the online tool yamllint.com"
+        bashio::exit.nok
+    fi
 else
-  # Create symlink for addon to create config
-  touch "${CONFIGSOURCE}"
-  ln -sf "$CONFIGSOURCE" /data
-  rm "$CONFIGSOURCE"
-  # Need to restart
-  bashio::log.fatal "Config file not found. The addon will create a new one, then stop. Please customize the file in $CONFIGSOURCE before restarting."
+    # Create symlink for addon to create config
+    touch "${CONFIGSOURCE}"
+    ln -sf "$CONFIGSOURCE" /data
+    rm "$CONFIGSOURCE"
+    # Need to restart
+    bashio::log.fatal "Config file not found. The addon will create a new one, then stop. Please customize the file in $CONFIGSOURCE before restarting."
 fi
 
 # Remove previous link or file
@@ -49,14 +49,14 @@ fi
 
 # Check if database is here or create symlink
 if [ -f "$DATABASESOURCE" ]; then
-  # Create symlink if not existing yet
-  ln -sf "${DATABASESOURCE}" /data && echo "creating symlink"
-  bashio::log.info "Using database file found in $DATABASESOURCE"
+    # Create symlink if not existing yet
+    ln -sf "${DATABASESOURCE}" /data && echo "creating symlink"
+    bashio::log.info "Using database file found in $DATABASESOURCE"
 else
-  # Create symlink for addon to create database
-  touch "${DATABASESOURCE}"
-  ln -sf "$DATABASESOURCE" /data
-  rm "$DATABASESOURCE"
+    # Create symlink for addon to create database
+    touch "${DATABASESOURCE}"
+    ln -sf "$DATABASESOURCE" /data
+    rm "$DATABASESOURCE"
 fi
 
 ##############
@@ -69,10 +69,10 @@ echo " "
 # Test mode
 TZ=$(bashio::config "TZ")
 if [ "$TZ" = "test" ]; then
-  echo "secret mode found, launching script in /config/test.sh"
-  cd /config || exit
-  chmod 777 test.sh
-  ./test.sh
+    echo "secret mode found, launching script in /config/test.sh"
+    cd /config || exit
+    chmod 777 test.sh
+    ./test.sh
 fi
 
 python -u /app/main.py || bashio::log.fatal "The app has crashed. Are you sure you entered the correct config options?"