Beautify bash

ubooquity/rootfs/etc/32-nginx_ingress.sh

@@ -14,13 +14,13 @@ declare port
 port=$(bashio::addon.ingress_port)
 # shellcheck disable=SC2210
 if [ "$port" ] >1; then
-  # Adapt nginx
-  sed -i "s|%%port%%|$port|g" /etc/nginx/servers/ingress.conf
-  sed -i "s|%%interface%%|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ingress.conf
-  # Removebaseurl
-  jq '.reverseProxyPrefix = ""' /config/addons_config/ubooquity/preferences.json | sponge /config/addons_config/ubooquity/preferences.json
-  # Log
-  bashio::log.info "Ingress enabled"
+    # Adapt nginx
+    sed -i "s|%%port%%|$port|g" /etc/nginx/servers/ingress.conf
+    sed -i "s|%%interface%%|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ingress.conf
+    # Removebaseurl
+    jq '.reverseProxyPrefix = ""' /config/addons_config/ubooquity/preferences.json | sponge /config/addons_config/ubooquity/preferences.json
+    # Log
+    bashio::log.info "Ingress enabled"
 else
-  rm /etc/nginx/servers/ingress.conf
+    rm /etc/nginx/servers/ingress.conf
 fi

ubooquity/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

ubooquity/rootfs/etc/cont-init.d/20-folders.sh

@@ -5,15 +5,15 @@ slug=ubooquity
 
 if [ ! -d /config/addons_config/$slug ]; then
 
-  if [ -d /config/$slug ]; then
-    echo "Moving to new location /config/addons_config/$slug"
+    if [ -d /config/$slug ]; then
+        echo "Moving to new location /config/addons_config/$slug"
+        mkdir -p /config/addons_config/$slug
+        chmod 777 /config/addons_config/$slug
+        mv /config/$slug/* /config/addons_config/$slug/
+        rm -r /config/$slug
+    fi
+
+    echo "Creating /config/addons_config/$slug"
     mkdir -p /config/addons_config/$slug
     chmod 777 /config/addons_config/$slug
-    mv /config/$slug/* /config/addons_config/$slug/
-    rm -r /config/$slug
-  fi
-
-  echo "Creating /config/addons_config/$slug"
-  mkdir -p /config/addons_config/$slug
-  chmod 777 /config/addons_config/$slug
 fi

ubooquity/rootfs/etc/cont-init.d/32-nginx_ssl.sh

@@ -17,11 +17,11 @@ sed -i "s|%%interface%%|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ssl.co
 
 # Ssl values
 if bashio::config.true 'ssl'; then
-        bashio::config.require.ssl
-        certfile=$(bashio::config 'certfile')
-        keyfile=$(bashio::config 'keyfile')
-        sed -i "s|default_server|ssl|g" /etc/nginx/servers/ssl.conf
-        sed -i "/proxy_params.conf/a ssl_certificate /ssl/$certfile;" /etc/nginx/servers/ssl.conf
-        sed -i "/proxy_params.conf/a ssl_certificate_key /ssl/$keyfile;" /etc/nginx/servers/ssl.conf
-        bashio::log.info "Ssl enabled, please use https for connection. UI is at https://YOURIP:$(bashio::addon.port 2205)/ubooquity ; admin is at https://YOURIP:$(bashio::addon.port 2206)/ubooquity/admin"
+    bashio::config.require.ssl
+    certfile=$(bashio::config 'certfile')
+    keyfile=$(bashio::config 'keyfile')
+    sed -i "s|default_server|ssl|g" /etc/nginx/servers/ssl.conf
+    sed -i "/proxy_params.conf/a ssl_certificate /ssl/$certfile;" /etc/nginx/servers/ssl.conf
+    sed -i "/proxy_params.conf/a ssl_certificate_key /ssl/$keyfile;" /etc/nginx/servers/ssl.conf
+    bashio::log.info "Ssl enabled, please use https for connection. UI is at https://YOURIP:$(bashio::addon.port 2205)/ubooquity ; admin is at https://YOURIP:$(bashio::addon.port 2206)/ubooquity/admin"
 fi

ubooquity/rootfs/etc/cont-init.d/93-custom_webUI.sh

@@ -6,29 +6,29 @@
 ################
 
 if bashio::config.has_value 'theme'; then
-  ### Variables
-  CUSTOMUI=$(bashio::config 'theme')
-  bashio::log.info "Alternate theme enabled : $CUSTOMUI. If webui don't work, disable this option"
+    ### Variables
+    CUSTOMUI=$(bashio::config 'theme')
+    bashio::log.info "Alternate theme enabled : $CUSTOMUI. If webui don't work, disable this option"
 
-  ### Download WebUI
-  case "$CUSTOMUI" in
-  "comixology2")
-    curl -f -s -S -J -L -o /data/release.zip https://github.com/scooterpsu/Comixology_Ubooquity_2/releases/download/v3.4/comixology2.zip >/dev/null &&
-      unzip -o -q /data/release.zip -d /config/addons_config/ubooquity/themes/
-    ;;
+    ### Download WebUI
+    case "$CUSTOMUI" in
+        "comixology2")
+            curl -f -s -S -J -L -o /data/release.zip https://github.com/scooterpsu/Comixology_Ubooquity_2/releases/download/v3.4/comixology2.zip >/dev/null &&
+            unzip -o -q /data/release.zip -d /config/addons_config/ubooquity/themes/
+            ;;
 
-  "plextheme-master")
-    curl -f -s -S -J -L -o /data/release.zip https://github.com/FinalAngel/plextheme/archive/master.zip >/dev/null &&
-      unzip -q /data/release.zip -d /config/addons_config/ubooquity/themes/
-    #    && mv /config/addons_config/ubooquity/themes/plextheme-master/ /config/addons_config/ubooquity/themes/
-    ;;
+        "plextheme-master")
+            curl -f -s -S -J -L -o /data/release.zip https://github.com/FinalAngel/plextheme/archive/master.zip >/dev/null &&
+            unzip -q /data/release.zip -d /config/addons_config/ubooquity/themes/
+            #    && mv /config/addons_config/ubooquity/themes/plextheme-master/ /config/addons_config/ubooquity/themes/
+            ;;
 
-  esac
+    esac
 
-  ### Clean files
-  rm /data/release.zip || true
+    ### Clean files
+    rm /data/release.zip || true
 
-  ### Set preference
-  jq --arg variable "$CUSTOMUI" '.theme = $variable' /config/addons_config/ubooquity/preferences.json | sponge /config/addons_config/ubooquity/preferences.json
+    ### Set preference
+    jq --arg variable "$CUSTOMUI" '.theme = $variable' /config/addons_config/ubooquity/preferences.json | sponge /config/addons_config/ubooquity/preferences.json
 
 fi