diff --git a/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh index becb302f9..c3b734dc1 100644 --- a/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -9,11 +9,11 @@ if [ ! -f "/usr/bin/bashio" ]; then apt-get clean apt-get update apt-get install -y --no-install-recommends \ - jq \ - cifs-utils \ + jq \ + cifs-utils \ keyutils \ - samba \ - smbclient + samba \ + smbclient apt-get clean ################### @@ -26,7 +26,6 @@ if [ ! -f "/usr/bin/bashio" ]; then mv /tmp/bashio/lib /usr/lib/bashio ln -s /usr/lib/bashio/bashio /usr/bin/bashio rm -rf /tmp/bashio - ) >/dev/null 2>/aaa && \ - echo "Bashio installed" | cat /aaa + ) >/dev/null fi diff --git a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh b/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh index 5cf83148e..e48d595e8 100644 --- a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh @@ -9,12 +9,12 @@ if [ ! -f "/usr/bin/bashio" ]; then apt-get clean && apt-get update && apt-get install -y --no-install-recommends \ - jq \ - cifs-utils \ + jq \ + cifs-utils \ keyutils \ - samba \ - smbclient \ - nginx && + samba \ + smbclient \ + nginx && apt-get clean ################### @@ -27,7 +27,6 @@ if [ ! -f "/usr/bin/bashio" ]; then mv /tmp/bashio/lib /usr/lib/bashio ln -s /usr/lib/bashio/bashio /usr/bin/bashio rm -rf /tmp/bashio - ) >/dev/null 2>/aaa && \ - echo "Bashio installed" | cat /aaa + ) >/dev/null fi diff --git a/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh index fdcd3c744..a796e90c3 100644 --- a/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh @@ -1,31 +1,30 @@ #!/bin/bash -# If dockerfile failed install manually +# If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" ( - # Remove errors on apt-get - export DEBIAN_FRONTEND=noninteractive - ################ - # Install apps # - ################ - apt-get clean + # Remove errors on apt-get + export DEBIAN_FRONTEND=noninteractive + ################ + # Install apps # + ################ + apt-get clean apt-get update apt-get install -yq --no-install-recommends \ - jq \ - curl \ - yamllint + jq \ + curl \ + yamllint - ################### - # Install bashio # - ################## - BASHIO_VERSION=0.13.1 - 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 - ) >/dev/null 2>/aaa && \ - echo "Bashio installed" | cat /aaa + ################### + # Install bashio # + ################## + BASHIO_VERSION=0.13.1 + 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 + ) >/dev/null fi diff --git a/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh index d4415f0ab..033253f6b 100644 --- a/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh @@ -1,31 +1,30 @@ #!/bin/bash -# If dockerfile failed install manually +# If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" ( - # Remove errors on apt-get - export DEBIAN_FRONTEND=noninteractive - ################ - # Install apps # - ################ - apt-get clean && - apt-get update && - apt-get install -yq --no-install-recommends \ - jq \ - curl \ - yamllint + # Remove errors on apt-get + export DEBIAN_FRONTEND=noninteractive + ################ + # Install apps # + ################ + apt-get clean && + apt-get update && + apt-get install -yq --no-install-recommends \ + jq \ + curl \ + yamllint - ################### - # Install bashio # - ################## - BASHIO_VERSION=0.13.1 - 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 - ) >/dev/null 2>/aaa && \ - echo "Bashio installed" | cat /aaa + ################### + # Install bashio # + ################## + BASHIO_VERSION=0.13.1 + 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 + ) >/dev/null fi diff --git a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh b/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh index b4d87bbc9..f8f3be2a8 100644 --- a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh @@ -7,15 +7,15 @@ if [ ! -f "/usr/bin/bashio" ]; then # Install apps # ################ apk add --no-cache \ - curl \ - jq \ - bash \ - cifs-utils \ - keyutils \ - samba \ - samba-client \ - bind-tools \ - nginx + curl \ + jq \ + bash \ + cifs-utils \ + keyutils \ + samba \ + samba-client \ + bind-tools \ + nginx ################### # Install bashio # @@ -33,7 +33,6 @@ if [ ! -f "/usr/bin/bashio" ]; then ######################################## mkdir -p -m 777 /config/filebrowser || true - ) >/dev/null 2>/aaa && \ - echo "Bashio installed" | cat /aaa + ) >/dev/null fi diff --git a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh b/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh index dd5398702..0ae87922d 100644 --- a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh @@ -9,9 +9,9 @@ if [ ! -f "/usr/bin/bashio" ]; then apt-get clean && apt-get update && apt-get install -y --no-install-recommends \ - jq \ - curl \ - yamllint + jq \ + curl \ + yamllint ################### # Install bashio # @@ -23,7 +23,6 @@ if [ ! -f "/usr/bin/bashio" ]; then mv /tmp/bashio/lib /usr/lib/bashio ln -s /usr/lib/bashio/bashio /usr/bin/bashio rm -rf /tmp/bashio - ) >/dev/null 2>/aaa && \ - echo "Bashio installed" | cat /aaa + ) >/dev/null fi diff --git a/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 9b11e72fe..bee0d296e 100644 --- a/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -8,10 +8,10 @@ if [ ! -f "/usr/bin/bashio" ]; then ################ apt-get update apt-get install -y --no-install-recommends \ - jq \ - samba \ - smbclient \ - nginx + jq \ + samba \ + smbclient \ + nginx apt-get -y upgrade cifs-utils # Allow UID and GID setting @@ -32,7 +32,6 @@ if [ ! -f "/usr/bin/bashio" ]; then mv /tmp/bashio/lib /usr/lib/bashio ln -s /usr/lib/bashio/bashio /usr/bin/bashio rm -rf /tmp/bashio - ) >/dev/null 2>/aaa && \ - echo "Bashio installed" | cat /aaa + ) >/dev/null fi diff --git a/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 5033f26b9..40eed4cbc 100644 --- a/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -8,22 +8,22 @@ if [ ! -f "/usr/bin/bashio" ]; then ################ apk update && apk add --no-cache \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba-client \ - samba || + jq \ + curl \ + cifs-utils \ + keyutils \ + samba-client \ + samba || ( apt-get clean && apt-get update && apt-get install -y --no-install-recommends \ - jq \ - curl \ - cifs-utils \ - keyutils \ - smbclient \ - samba + jq \ + curl \ + cifs-utils \ + keyutils \ + smbclient \ + samba ) ################### @@ -36,7 +36,6 @@ if [ ! -f "/usr/bin/bashio" ]; then mv /tmp/bashio/lib /usr/lib/bashio ln -s /usr/lib/bashio/bashio /usr/bin/bashio rm -rf /tmp/bashio - ) >/dev/null 2>/aaa && \ - echo "Bashio installed" | cat /aaa + ) >/dev/null fi diff --git a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index dc082a01a..2fef82c60 100644 --- a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -9,20 +9,20 @@ if [ ! -f "/usr/bin/bashio" ]; then apt-get clean && apt-get update && apt-get install -y --no-install-recommends \ - jq \ - curl \ - cifs-utils \ - keyutils \ - smbclient \ - samba || + jq \ + curl \ + cifs-utils \ + keyutils \ + smbclient \ + samba || apk update && apk add --no-cache \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba-client \ - samba + jq \ + curl \ + cifs-utils \ + keyutils \ + samba-client \ + samba ################### # Install bashio # @@ -34,7 +34,6 @@ if [ ! -f "/usr/bin/bashio" ]; then mv /tmp/bashio/lib /usr/lib/bashio ln -s /usr/lib/bashio/bashio /usr/bin/bashio rm -rf /tmp/bashio - ) >/dev/null 2>/aaa && \ - echo "Bashio installed" | cat /aaa + ) >/dev/null fi diff --git a/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 227cf1879..dd2e31c50 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -8,31 +8,31 @@ if [ ! -f "/usr/bin/bashio" ]; then # Install apps # ################ apt-get clean \ - apt-get update \ - apt-get install -y \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba \ - smbclient \ - nginx \ - coreutils \ - openvpn + apt-get update \ + apt-get install -y \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ + nginx \ + coreutils \ + openvpn apt-get clean ################## # Install tempio # ################## curl -L -f -s -o /usr/bin/tempio \ - "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \ - chmod a+x /usr/bin/tempio + "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \ + chmod a+x /usr/bin/tempio ################## # Install bashio # ################## mkdir -p /tmp/bashio \ - curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | + 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 @@ -54,12 +54,10 @@ if [ ! -f "/usr/bin/bashio" ]; then sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf # Remove fixed folders, allows connection to webUI - sed '11,13d' /defaults/qBittorrent.conf \ - echo 'WebUI\HostHeaderValidation=false' \ - echo 'WebUI\LocalHostAuth=false' >>/defaults/qBittorrent.conf \ - >>/defaults/qBittorrent.conf + sed '11,13d' /defaults/qBittorrent.conf + echo 'WebUI\HostHeaderValidation=false' >>/defaults/qBittorrent.conf + echo 'WebUI\LocalHostAuth=false' >>/defaults/qBittorrent.conf - ) >/dev/null 2>/aaa && \ - echo "Bashio installed" | cat /aaa + ) >/dev/null fi diff --git a/webtrees/rootfs/script/00-aaa_dockerfile_backup.sh b/webtrees/rootfs/script/00-aaa_dockerfile_backup.sh index 52b81ab2e..9252c3b6e 100644 --- a/webtrees/rootfs/script/00-aaa_dockerfile_backup.sh +++ b/webtrees/rootfs/script/00-aaa_dockerfile_backup.sh @@ -9,8 +9,8 @@ if [ ! -f "/usr/bin/bashio" ]; then apt-get clean && apt-get update && apt-get install -y \ - jq \ - curl && + jq \ + curl && apt-get clean ################ @@ -29,7 +29,6 @@ if [ ! -f "/usr/bin/bashio" ]; then mv /tmp/bashio/lib /usr/lib/bashio ln -s /usr/lib/bashio/bashio /usr/bin/bashio rm -rf /tmp/bashio - ) >/dev/null 2>/aaa && \ - echo "Bashio installed" | cat /aaa + ) >/dev/null fi