Beautify bash

2026-05-03 07:40:52 +02:00 · 2022-03-16 09:56:19 +00:00
parent 9ad60be58b
commit dc791623d5
146 changed files with 2017 additions and 2017 deletions
--- a/zoneminder/rootfs/entrypoint.sh
+++ b/zoneminder/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
--- a/zoneminder/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/zoneminder/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
--- a/zoneminder/rootfs/etc/cont-init.d/99-run.sh
+++ b/zoneminder/rootfs/etc/cont-init.d/99-run.sh
@@ -9,8 +9,8 @@
 CONFIGSOURCE="/config/addons_config/zoneminder"
 if [ ! -f "$CONFIGSOURCE"/zm.conf ]; then

-# Copy conf files
-cp /etc/zm/zm.conf "$CONFIGSOURCE"
+    # Copy conf files
+    cp /etc/zm/zm.conf "$CONFIGSOURCE"
 fi

 ###################
@@ -20,57 +20,57 @@ fi
 bashio::log.info "Defining database"
 case "$(bashio::config "DB_CONNECTION")" in

-# Use MariaDB
-mariadb_addon)
-    bashio::log.info "Using MariaDB addon. Requirements : running MariaDB addon. Detecting values..."
-    if ! bashio::services.available 'mysql'; then
-        bashio::log.fatal \
-        "Local database access should be provided by the MariaDB addon"
-        bashio::exit.nok \
-        "Please ensure it is installed and started"
-    fi
-
-    # Use values
-    DB_CONNECTION=mysql
-    ZM_DB_HOST=$(bashio::services "mysql" "host")
-    ZM_DB_PORT=$(bashio::services "mysql" "port")
-    ZM_DB_NAME=firefly
-    ZM_DB_USER=$(bashio::services "mysql" "username")
-    ZM_DB_PASS=$(bashio::services "mysql" "password")
-    export DB_CONNECTION
-    export remoteDB=1
-    export ZM_DB_HOST && bashio::log.blue "ZM_DB_HOST=$ZM_DB_HOST"
-    export ZM_DB_PORT && bashio::log.blue "ZM_DB_PORT=$ZM_DB_PORT"
-    export ZM_DB_NAME && bashio::log.blue "ZM_DB_NAME=$ZM_DB_NAME"
-    export ZM_DB_USER && bashio::log.blue "ZM_DB_USER=$ZM_DB_USER"
-    export ZM_DB_PASS && bashio::log.blue "ZM_DB_PASS=$ZM_DB_PASS"
-
-    bashio::log.warning "Firefly-iii is using the Maria DB addon"
-    bashio::log.warning "Please ensure this is included in your backups"
-    bashio::log.warning "Uninstalling the MariaDB addon will remove any data"
-
-    bashio::log.info "Creating database for Firefly-iii if required"
-    mysql \
-    -u "${ZM_DB_USER}" -p"${ZM_DB_PASS}" \
-    -h "${ZM_DB_HOST}" -P "${ZM_DB_PORT}" \
-    -e "CREATE DATABASE IF NOT EXISTS \`firefly\` ;"
-    ;;
-
-# Use remote
-external)
-    bashio::log.info "Using remote database. Requirement : filling all addon options fields, and making sure the database already exists"
-    for conditions in "ZM_DB_HOST" "ZM_DB_PORT" "ZM_DB_NAME" "ZM_DB_USER" "ZM_DB_PASS"; do
-        if ! bashio::config.has_value "$conditions"; then
-            bashio::exit.nok "Remote database has been specified but $conditions is not defined in addon options"
+        # Use MariaDB
+    mariadb_addon)
+        bashio::log.info "Using MariaDB addon. Requirements : running MariaDB addon. Detecting values..."
+        if ! bashio::services.available 'mysql'; then
+            bashio::log.fatal \
+                "Local database access should be provided by the MariaDB addon"
+            bashio::exit.nok \
+                "Please ensure it is installed and started"
        fi
-    done
-    ;;
+
+        # Use values
+        DB_CONNECTION=mysql
+        ZM_DB_HOST=$(bashio::services "mysql" "host")
+        ZM_DB_PORT=$(bashio::services "mysql" "port")
+        ZM_DB_NAME=firefly
+        ZM_DB_USER=$(bashio::services "mysql" "username")
+        ZM_DB_PASS=$(bashio::services "mysql" "password")
+        export DB_CONNECTION
+        export remoteDB=1
+        export ZM_DB_HOST && bashio::log.blue "ZM_DB_HOST=$ZM_DB_HOST"
+        export ZM_DB_PORT && bashio::log.blue "ZM_DB_PORT=$ZM_DB_PORT"
+        export ZM_DB_NAME && bashio::log.blue "ZM_DB_NAME=$ZM_DB_NAME"
+        export ZM_DB_USER && bashio::log.blue "ZM_DB_USER=$ZM_DB_USER"
+        export ZM_DB_PASS && bashio::log.blue "ZM_DB_PASS=$ZM_DB_PASS"
+
+        bashio::log.warning "Firefly-iii is using the Maria DB addon"
+        bashio::log.warning "Please ensure this is included in your backups"
+        bashio::log.warning "Uninstalling the MariaDB addon will remove any data"
+
+        bashio::log.info "Creating database for Firefly-iii if required"
+        mysql \
+            -u "${ZM_DB_USER}" -p"${ZM_DB_PASS}" \
+            -h "${ZM_DB_HOST}" -P "${ZM_DB_PORT}" \
+            -e "CREATE DATABASE IF NOT EXISTS \`firefly\` ;"
+        ;;
+
+        # Use remote
+    external)
+        bashio::log.info "Using remote database. Requirement : filling all addon options fields, and making sure the database already exists"
+        for conditions in "ZM_DB_HOST" "ZM_DB_PORT" "ZM_DB_NAME" "ZM_DB_USER" "ZM_DB_PASS"; do
+            if ! bashio::config.has_value "$conditions"; then
+                bashio::exit.nok "Remote database has been specified but $conditions is not defined in addon options"
+            fi
+        done
+        ;;


-# Use remote
-*)
-    bashio::log.info "Using internal database"
-    ;;
+        # Use remote
+    *)
+        bashio::log.info "Using internal database"
+        ;;

 esac