From 65fd606ae311bd8c1a736e679bca2a92e3183a7f Mon Sep 17 00:00:00 2001 From: Alexandre Date: Fri, 14 Jan 2022 12:05:12 +0100 Subject: [PATCH] align to cont-init.d --- addons_updater/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - arpspoof/Dockerfile | 1 - arpspoof/rootfs/entrypoint.sh | 2 +- .../cont-init.d}/00-aaa_dockerfile_backup.sh | 1 - .../{scripts => etc/cont-init.d}/99-run.sh | 0 bazarr/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - bitwarden/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - booksonic_air/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - cloudcommander/Dockerfile | 1 - cloudcommander/rootfs/entrypoint.sh | 2 +- .../cont-init.d}/00-aaa_dockerfile_backup.sh | 1 - .../{scripts => etc/cont-init.d}/99-run.sh | 0 code-server/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - elasticsearch/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - emby/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - enedisgateway2mqtt/Dockerfile | 1 - enedisgateway2mqtt/rootfs/entrypoint.sh | 2 +- .../cont-init.d}/00-aaa_dockerfile_backup.sh | 1 - .../etc/cont-init.d}/91-mqtt_autodiscover.sh | 2 +- .../{scripts => etc/cont-init.d}/99-run.sh | 0 enedisgateway2mqtt_dev/Dockerfile | 1 - enedisgateway2mqtt_dev/rootfs/entrypoint.sh | 4 +- .../cont-init.d}/00-aaa_dockerfile_backup.sh | 1 - .../{scripts => etc/cont-init.d}/99-run.sh | 0 filebrowser/Dockerfile | 1 - filebrowser/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../cont-init.d}/20-folders.sh | 0 .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- fireflyiii/Dockerfile | 1 - fireflyiii/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../rootfs/etc/cont-init.d}/00-global_var.sh | 2 +- .../cont-init.d}/20-folders.sh | 0 .../cont-init.d}/92-config_yaml.sh | 9 +- .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- fireflyiii_data_importer/Dockerfile | 1 - fireflyiii_data_importer/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../{scripts => etc/cont-init.d}/00-banner.sh | 0 .../rootfs/etc/cont-init.d}/00-global_var.sh | 3 +- .../cont-init.d}/20-folders.sh | 0 .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- flaresolverr/Dockerfile | 1 - flaresolverr/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../{scripts => etc/cont-init.d}/00-banner.sh | 0 .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- flexget/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - gazpar2mqtt/Dockerfile | 1 - gazpar2mqtt/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../{scripts => etc/cont-init.d}/00-banner.sh | 0 .../etc/cont-init.d}/91-mqtt_autodiscover.sh | 2 +- .../cont-init.d}/92-config_yaml.sh | 9 +- .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- grav/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - inadyn/Dockerfile | 1 - inadyn/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../{scripts => etc/cont-init.d}/00-banner.sh | 0 .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- jackett/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - jellyfin/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - joal/Dockerfile | 1 - joal/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- joplin/Dockerfile | 1 - joplin/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../{scripts => etc/cont-init.d}/00-banner.sh | 0 .../rootfs/etc/cont-init.d}/00-global_var.sh | 3 +- .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- lidarr/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - mealie/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - mylar3/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - nextcloud/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - nzbget/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - ombi/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - organizr/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - paperless_ng/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - .../rootfs/etc/cont-init.d/90-config_yaml.sh | 9 +- papermerge/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - photoprism/Dockerfile | 1 - photoprism/rootfs/00-aaa_dockerfile_backup.sh | 29 ------- photoprism/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../rootfs/{ => etc/cont-init.d}/00-banner.sh | 0 .../{ => etc/cont-init.d}/92-local_mounts.sh | 0 .../{ => etc/cont-init.d}/92-smb_mounts.sh | 0 .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- photoprism/rootfs/scripts/92-smb_mounts.sh | 83 ------------------- piwigo/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - plex/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - portainer/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - prowlarr/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - qbittorrent/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - radarr/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - readarr/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - requestrr/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - resiliosync/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - scrutiny/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - sonarr/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - tandoor_recipes/Dockerfile | 1 - tandoor_recipes/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../cont-init.d}/20-folders.sh | 0 .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- teamspeak/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - transmission/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - ubooquity/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - webtop/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - webtrees/Dockerfile | 1 - webtrees/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../rootfs/etc/cont-init.d}/00-banner.sh | 0 .../cont-init.d}/90-config_yaml.sh | 9 +- .../etc/cont-init.d}/92-local_mounts.sh | 0 .../cont-init.d}/92-smb_mounts.sh | 0 .../cont-init.d}/99-custom_script.sh | 0 .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- webtrees/rootfs/scripts/92-local_mounts.sh | 32 ------- wger/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - whoogle/Dockerfile | 1 - whoogle/rootfs/entrypoint.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 ++++++++ .../rootfs/etc/cont-init.d}/00-banner.sh | 0 .../rootfs/etc/cont-init.d}/00-global_var.sh | 3 +- .../cont-init.d}/90-config_yaml.sh | 1 - .../{scripts => etc/cont-init.d}/99-run.sh | 0 .../scripts/00-aaa_dockerfile_backup.sh | 36 -------- whoogle/rootfs/scripts/00-banner.sh | 39 --------- xteve/Dockerfile | 1 - .../cont-init.d/00-aaa_dockerfile_backup.sh | 1 - zzz_templates/00-aaa_dockerfile_backup.sh | 15 ++-- zzz_templates/00-global_var.sh | 2 +- zzz_templates/90-config_yaml.sh | 9 +- zzz_templates/automatic_packages.sh | 4 +- 186 files changed, 472 insertions(+), 773 deletions(-) rename arpspoof/rootfs/{scripts => etc/cont-init.d}/00-aaa_dockerfile_backup.sh (94%) rename arpspoof/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) rename cloudcommander/rootfs/{scripts => etc/cont-init.d}/00-aaa_dockerfile_backup.sh (94%) rename cloudcommander/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) rename enedisgateway2mqtt/rootfs/{scripts => etc/cont-init.d}/00-aaa_dockerfile_backup.sh (94%) rename {gazpar2mqtt/rootfs/scripts => enedisgateway2mqtt/rootfs/etc/cont-init.d}/91-mqtt_autodiscover.sh (95%) rename enedisgateway2mqtt/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) rename enedisgateway2mqtt_dev/rootfs/{scripts => etc/cont-init.d}/00-aaa_dockerfile_backup.sh (94%) rename enedisgateway2mqtt_dev/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) create mode 100644 filebrowser/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename filebrowser/rootfs/{scripts => etc/cont-init.d}/20-folders.sh (100%) rename filebrowser/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh create mode 100644 fireflyiii/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename {whoogle/rootfs/scripts => fireflyiii/rootfs/etc/cont-init.d}/00-global_var.sh (89%) rename fireflyiii/rootfs/{scripts => etc/cont-init.d}/20-folders.sh (100%) rename fireflyiii/rootfs/{scripts => etc/cont-init.d}/92-config_yaml.sh (93%) rename fireflyiii/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh create mode 100644 fireflyiii_data_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename fireflyiii_data_importer/rootfs/{scripts => etc/cont-init.d}/00-banner.sh (100%) rename {fireflyiii/rootfs/scripts => fireflyiii_data_importer/rootfs/etc/cont-init.d}/00-global_var.sh (89%) rename fireflyiii_data_importer/rootfs/{scripts => etc/cont-init.d}/20-folders.sh (100%) rename fireflyiii_data_importer/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh create mode 100644 flaresolverr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename flaresolverr/rootfs/{scripts => etc/cont-init.d}/00-banner.sh (100%) rename flaresolverr/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh create mode 100644 gazpar2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename gazpar2mqtt/rootfs/{scripts => etc/cont-init.d}/00-banner.sh (100%) rename {enedisgateway2mqtt/rootfs/scripts => gazpar2mqtt/rootfs/etc/cont-init.d}/91-mqtt_autodiscover.sh (95%) rename gazpar2mqtt/rootfs/{scripts => etc/cont-init.d}/92-config_yaml.sh (93%) rename gazpar2mqtt/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh create mode 100644 inadyn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename inadyn/rootfs/{scripts => etc/cont-init.d}/00-banner.sh (100%) rename inadyn/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh create mode 100644 joal/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename joal/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 joal/rootfs/scripts/00-aaa_dockerfile_backup.sh create mode 100644 joplin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename joplin/rootfs/{scripts => etc/cont-init.d}/00-banner.sh (100%) rename {fireflyiii_data_importer/rootfs/scripts => joplin/rootfs/etc/cont-init.d}/00-global_var.sh (89%) rename joplin/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh delete mode 100644 photoprism/rootfs/00-aaa_dockerfile_backup.sh create mode 100644 photoprism/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename photoprism/rootfs/{ => etc/cont-init.d}/00-banner.sh (100%) rename photoprism/rootfs/{ => etc/cont-init.d}/92-local_mounts.sh (100%) rename photoprism/rootfs/{ => etc/cont-init.d}/92-smb_mounts.sh (100%) rename photoprism/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh delete mode 100644 photoprism/rootfs/scripts/92-smb_mounts.sh create mode 100644 tandoor_recipes/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename tandoor_recipes/rootfs/{scripts => etc/cont-init.d}/20-folders.sh (100%) rename tandoor_recipes/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 tandoor_recipes/rootfs/scripts/00-aaa_dockerfile_backup.sh create mode 100644 webtrees/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename {photoprism/rootfs/scripts => webtrees/rootfs/etc/cont-init.d}/00-banner.sh (100%) rename webtrees/rootfs/{scripts => etc/cont-init.d}/90-config_yaml.sh (93%) rename {photoprism/rootfs/scripts => webtrees/rootfs/etc/cont-init.d}/92-local_mounts.sh (100%) rename webtrees/rootfs/{scripts => etc/cont-init.d}/92-smb_mounts.sh (100%) rename webtrees/rootfs/{scripts => etc/cont-init.d}/99-custom_script.sh (100%) rename webtrees/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh delete mode 100644 webtrees/rootfs/scripts/92-local_mounts.sh create mode 100644 whoogle/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh rename {webtrees/rootfs/scripts => whoogle/rootfs/etc/cont-init.d}/00-banner.sh (100%) rename {joplin/rootfs/scripts => whoogle/rootfs/etc/cont-init.d}/00-global_var.sh (89%) rename whoogle/rootfs/{scripts => etc/cont-init.d}/90-config_yaml.sh (98%) rename whoogle/rootfs/{scripts => etc/cont-init.d}/99-run.sh (100%) delete mode 100644 whoogle/rootfs/scripts/00-aaa_dockerfile_backup.sh delete mode 100644 whoogle/rootfs/scripts/00-banner.sh diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile index 7a49b1dde..a05c10663 100644 --- a/addons_updater/Dockerfile +++ b/addons_updater/Dockerfile @@ -37,7 +37,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/addons_updater/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/addons_updater/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/addons_updater/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/addons_updater/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 diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index 587c099f7..60e9a4e03 100644 --- a/arpspoof/Dockerfile +++ b/arpspoof/Dockerfile @@ -37,7 +37,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/arpspoof/rootfs/entrypoint.sh b/arpspoof/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/arpspoof/rootfs/entrypoint.sh +++ b/arpspoof/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" diff --git a/arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh b/arpspoof/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh similarity index 94% rename from arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh rename to arpspoof/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/arpspoof/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/arpspoof/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 diff --git a/arpspoof/rootfs/scripts/99-run.sh b/arpspoof/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from arpspoof/rootfs/scripts/99-run.sh rename to arpspoof/rootfs/etc/cont-init.d/99-run.sh diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index f297cf412..505455d57 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -47,7 +47,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/bazarr/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 diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile index 228e3dde0..03628c9c3 100644 --- a/bitwarden/Dockerfile +++ b/bitwarden/Dockerfile @@ -45,7 +45,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/bitwarden/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 diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index 7dd21842d..0de667c8c 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -44,7 +44,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/booksonic_air/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 diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index 3fdca1d21..151f0bcf2 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -36,7 +36,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/cloudcommander/rootfs/entrypoint.sh b/cloudcommander/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/cloudcommander/rootfs/entrypoint.sh +++ b/cloudcommander/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" diff --git a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh b/cloudcommander/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh similarity index 94% rename from cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh rename to cloudcommander/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/cloudcommander/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 diff --git a/cloudcommander/rootfs/scripts/99-run.sh b/cloudcommander/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from cloudcommander/rootfs/scripts/99-run.sh rename to cloudcommander/rootfs/etc/cont-init.d/99-run.sh diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 0f83a0687..21cad3393 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -46,7 +46,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/code-server/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 diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 34cc613b9..1930626a2 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -49,7 +49,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/elasticsearch/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 diff --git a/emby/Dockerfile b/emby/Dockerfile index 7f5d971b3..cbbf8c510 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -50,7 +50,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/emby/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 diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile index 67f4b4fed..6b16ebdbc 100644 --- a/enedisgateway2mqtt/Dockerfile +++ b/enedisgateway2mqtt/Dockerfile @@ -37,7 +37,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/enedisgateway2mqtt/rootfs/entrypoint.sh b/enedisgateway2mqtt/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/enedisgateway2mqtt/rootfs/entrypoint.sh +++ b/enedisgateway2mqtt/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" diff --git a/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh similarity index 94% rename from enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh rename to enedisgateway2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/enedisgateway2mqtt/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 diff --git a/gazpar2mqtt/rootfs/scripts/91-mqtt_autodiscover.sh b/enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh similarity index 95% rename from gazpar2mqtt/rootfs/scripts/91-mqtt_autodiscover.sh rename to enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh index 7059655a9..6cc507a06 100644 --- a/gazpar2mqtt/rootfs/scripts/91-mqtt_autodiscover.sh +++ b/enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh @@ -17,7 +17,7 @@ if bashio::config.true 'mqtt_autodiscover'; then export MQTT_PASSWORD=$(bashio::services mqtt "password") # Export variables for variables in "MQTT_HOST=$MQTT_HOST" "MQTT_PORT=$MQTT_PORT" "MQTT_SSL=$MQTT_SSL" "MQTT_USERNAME=$MQTT_USERNAME" "MQTT_PASSWORD=$MQTT_PASSWORD"; do - sed -i "1a export $variables" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $variables" /scripts/*run* + sed -i "1a export $variables" /etc/services.d/*/*run* 2>/dev/null # Log bashio::log.blue "$variables" done diff --git a/enedisgateway2mqtt/rootfs/scripts/99-run.sh b/enedisgateway2mqtt/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from enedisgateway2mqtt/rootfs/scripts/99-run.sh rename to enedisgateway2mqtt/rootfs/etc/cont-init.d/99-run.sh diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile index 9dea6b57a..7fa54e136 100644 --- a/enedisgateway2mqtt_dev/Dockerfile +++ b/enedisgateway2mqtt_dev/Dockerfile @@ -37,7 +37,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/enedisgateway2mqtt_dev/rootfs/entrypoint.sh b/enedisgateway2mqtt_dev/rootfs/entrypoint.sh index 4962844d8..ba3d7c058 100644 --- a/enedisgateway2mqtt_dev/rootfs/entrypoint.sh +++ b/enedisgateway2mqtt_dev/rootfs/entrypoint.sh @@ -5,11 +5,11 @@ 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" chmod a+x "$SCRIPTS" sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" || true /./"$SCRIPTS" || echo "$SCRIPTS: exiting $?" -done \ No newline at end of file +done diff --git a/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh similarity index 94% rename from enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh rename to enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/enedisgateway2mqtt_dev/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 diff --git a/enedisgateway2mqtt_dev/rootfs/scripts/99-run.sh b/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from enedisgateway2mqtt_dev/rootfs/scripts/99-run.sh rename to enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/99-run.sh diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index 36b38983d..9c214f8ed 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -38,7 +38,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/filebrowser/rootfs/entrypoint.sh b/filebrowser/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/filebrowser/rootfs/entrypoint.sh +++ b/filebrowser/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" diff --git a/filebrowser/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/filebrowser/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/filebrowser/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/filebrowser/rootfs/scripts/20-folders.sh b/filebrowser/rootfs/etc/cont-init.d/20-folders.sh similarity index 100% rename from filebrowser/rootfs/scripts/20-folders.sh rename to filebrowser/rootfs/etc/cont-init.d/20-folders.sh diff --git a/filebrowser/rootfs/scripts/99-run.sh b/filebrowser/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from filebrowser/rootfs/scripts/99-run.sh rename to filebrowser/rootfs/etc/cont-init.d/99-run.sh diff --git a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh b/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index 9a2211447..a52f30fbd 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -43,7 +43,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/fireflyiii/rootfs/entrypoint.sh b/fireflyiii/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/fireflyiii/rootfs/entrypoint.sh +++ b/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" diff --git a/fireflyiii/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/fireflyiii/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/fireflyiii/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/whoogle/rootfs/scripts/00-global_var.sh b/fireflyiii/rootfs/etc/cont-init.d/00-global_var.sh similarity index 89% rename from whoogle/rootfs/scripts/00-global_var.sh rename to fireflyiii/rootfs/etc/cont-init.d/00-global_var.sh index 55611f7e0..1798293bd 100644 --- a/whoogle/rootfs/scripts/00-global_var.sh +++ b/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 ################ diff --git a/fireflyiii/rootfs/scripts/20-folders.sh b/fireflyiii/rootfs/etc/cont-init.d/20-folders.sh similarity index 100% rename from fireflyiii/rootfs/scripts/20-folders.sh rename to fireflyiii/rootfs/etc/cont-init.d/20-folders.sh diff --git a/fireflyiii/rootfs/scripts/92-config_yaml.sh b/fireflyiii/rootfs/etc/cont-init.d/92-config_yaml.sh similarity index 93% rename from fireflyiii/rootfs/scripts/92-config_yaml.sh rename to fireflyiii/rootfs/etc/cont-init.d/92-config_yaml.sh index 4ce48c496..fd2ecb81a 100644 --- a/fireflyiii/rootfs/scripts/92-config_yaml.sh +++ b/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 diff --git a/fireflyiii/rootfs/scripts/99-run.sh b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from fireflyiii/rootfs/scripts/99-run.sh rename to fireflyiii/rootfs/etc/cont-init.d/99-run.sh diff --git a/fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh b/fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/fireflyiii/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index 980839e27..ecc3e866d 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -44,7 +44,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/fireflyiii_data_importer/rootfs/entrypoint.sh b/fireflyiii_data_importer/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/fireflyiii_data_importer/rootfs/entrypoint.sh +++ b/fireflyiii_data_importer/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" diff --git a/fireflyiii_data_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/fireflyiii_data_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/fireflyiii_data_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/fireflyiii_data_importer/rootfs/scripts/00-banner.sh b/fireflyiii_data_importer/rootfs/etc/cont-init.d/00-banner.sh similarity index 100% rename from fireflyiii_data_importer/rootfs/scripts/00-banner.sh rename to fireflyiii_data_importer/rootfs/etc/cont-init.d/00-banner.sh diff --git a/fireflyiii/rootfs/scripts/00-global_var.sh b/fireflyiii_data_importer/rootfs/etc/cont-init.d/00-global_var.sh similarity index 89% rename from fireflyiii/rootfs/scripts/00-global_var.sh rename to fireflyiii_data_importer/rootfs/etc/cont-init.d/00-global_var.sh index b68e3f08b..1798293bd 100644 --- a/fireflyiii/rootfs/scripts/00-global_var.sh +++ b/fireflyiii_data_importer/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 - diff --git a/fireflyiii_data_importer/rootfs/scripts/20-folders.sh b/fireflyiii_data_importer/rootfs/etc/cont-init.d/20-folders.sh similarity index 100% rename from fireflyiii_data_importer/rootfs/scripts/20-folders.sh rename to fireflyiii_data_importer/rootfs/etc/cont-init.d/20-folders.sh diff --git a/fireflyiii_data_importer/rootfs/scripts/99-run.sh b/fireflyiii_data_importer/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from fireflyiii_data_importer/rootfs/scripts/99-run.sh rename to fireflyiii_data_importer/rootfs/etc/cont-init.d/99-run.sh diff --git a/fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh b/fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/fireflyiii_data_importer/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index f2e89e4e1..9eb542f8d 100644 --- a/flaresolverr/Dockerfile +++ b/flaresolverr/Dockerfile @@ -38,7 +38,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/flaresolverr/rootfs/entrypoint.sh b/flaresolverr/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/flaresolverr/rootfs/entrypoint.sh +++ b/flaresolverr/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" diff --git a/flaresolverr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/flaresolverr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/flaresolverr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/flaresolverr/rootfs/scripts/00-banner.sh b/flaresolverr/rootfs/etc/cont-init.d/00-banner.sh similarity index 100% rename from flaresolverr/rootfs/scripts/00-banner.sh rename to flaresolverr/rootfs/etc/cont-init.d/00-banner.sh diff --git a/flaresolverr/rootfs/scripts/99-run.sh b/flaresolverr/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from flaresolverr/rootfs/scripts/99-run.sh rename to flaresolverr/rootfs/etc/cont-init.d/99-run.sh diff --git a/flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh b/flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/flaresolverr/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 6966d6d5b..30b295caf 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -53,7 +53,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/flexget/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 diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile index 7e92eadc4..977e753f9 100644 --- a/gazpar2mqtt/Dockerfile +++ b/gazpar2mqtt/Dockerfile @@ -37,7 +37,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/gazpar2mqtt/rootfs/entrypoint.sh b/gazpar2mqtt/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/gazpar2mqtt/rootfs/entrypoint.sh +++ b/gazpar2mqtt/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" diff --git a/gazpar2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/gazpar2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/gazpar2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/gazpar2mqtt/rootfs/scripts/00-banner.sh b/gazpar2mqtt/rootfs/etc/cont-init.d/00-banner.sh similarity index 100% rename from gazpar2mqtt/rootfs/scripts/00-banner.sh rename to gazpar2mqtt/rootfs/etc/cont-init.d/00-banner.sh diff --git a/enedisgateway2mqtt/rootfs/scripts/91-mqtt_autodiscover.sh b/gazpar2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh similarity index 95% rename from enedisgateway2mqtt/rootfs/scripts/91-mqtt_autodiscover.sh rename to gazpar2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh index 7059655a9..6cc507a06 100644 --- a/enedisgateway2mqtt/rootfs/scripts/91-mqtt_autodiscover.sh +++ b/gazpar2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh @@ -17,7 +17,7 @@ if bashio::config.true 'mqtt_autodiscover'; then export MQTT_PASSWORD=$(bashio::services mqtt "password") # Export variables for variables in "MQTT_HOST=$MQTT_HOST" "MQTT_PORT=$MQTT_PORT" "MQTT_SSL=$MQTT_SSL" "MQTT_USERNAME=$MQTT_USERNAME" "MQTT_PASSWORD=$MQTT_PASSWORD"; do - sed -i "1a export $variables" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $variables" /scripts/*run* + sed -i "1a export $variables" /etc/services.d/*/*run* 2>/dev/null # Log bashio::log.blue "$variables" done diff --git a/gazpar2mqtt/rootfs/scripts/92-config_yaml.sh b/gazpar2mqtt/rootfs/etc/cont-init.d/92-config_yaml.sh similarity index 93% rename from gazpar2mqtt/rootfs/scripts/92-config_yaml.sh rename to gazpar2mqtt/rootfs/etc/cont-init.d/92-config_yaml.sh index 4ce48c496..fd2ecb81a 100644 --- a/gazpar2mqtt/rootfs/scripts/92-config_yaml.sh +++ b/gazpar2mqtt/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 diff --git a/gazpar2mqtt/rootfs/scripts/99-run.sh b/gazpar2mqtt/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from gazpar2mqtt/rootfs/scripts/99-run.sh rename to gazpar2mqtt/rootfs/etc/cont-init.d/99-run.sh diff --git a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh b/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/grav/Dockerfile b/grav/Dockerfile index 6df90bd76..f059b4387 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -47,7 +47,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/grav/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 diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile index f2ad1d113..918740560 100644 --- a/inadyn/Dockerfile +++ b/inadyn/Dockerfile @@ -40,7 +40,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/inadyn/rootfs/entrypoint.sh b/inadyn/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/inadyn/rootfs/entrypoint.sh +++ b/inadyn/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" diff --git a/inadyn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/inadyn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/inadyn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/inadyn/rootfs/scripts/00-banner.sh b/inadyn/rootfs/etc/cont-init.d/00-banner.sh similarity index 100% rename from inadyn/rootfs/scripts/00-banner.sh rename to inadyn/rootfs/etc/cont-init.d/00-banner.sh diff --git a/inadyn/rootfs/scripts/99-run.sh b/inadyn/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from inadyn/rootfs/scripts/99-run.sh rename to inadyn/rootfs/etc/cont-init.d/99-run.sh diff --git a/inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh b/inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/inadyn/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/jackett/Dockerfile b/jackett/Dockerfile index bb3866067..67244db10 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -48,7 +48,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/jackett/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 diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 8fbd5bfb0..3497fe77e 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -46,7 +46,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/jellyfin/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 diff --git a/joal/Dockerfile b/joal/Dockerfile index 18e185d3f..dabc7aea8 100644 --- a/joal/Dockerfile +++ b/joal/Dockerfile @@ -61,7 +61,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 ################ diff --git a/joal/rootfs/entrypoint.sh b/joal/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/joal/rootfs/entrypoint.sh +++ b/joal/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" diff --git a/joal/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/joal/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/joal/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/joal/rootfs/scripts/99-run.sh b/joal/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from joal/rootfs/scripts/99-run.sh rename to joal/rootfs/etc/cont-init.d/99-run.sh diff --git a/joal/rootfs/scripts/00-aaa_dockerfile_backup.sh b/joal/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/joal/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/joplin/Dockerfile b/joplin/Dockerfile index 048d670a5..aa979ea9b 100644 --- a/joplin/Dockerfile +++ b/joplin/Dockerfile @@ -38,7 +38,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/joplin/rootfs/entrypoint.sh b/joplin/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/joplin/rootfs/entrypoint.sh +++ b/joplin/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" diff --git a/joplin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/joplin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/joplin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/joplin/rootfs/scripts/00-banner.sh b/joplin/rootfs/etc/cont-init.d/00-banner.sh similarity index 100% rename from joplin/rootfs/scripts/00-banner.sh rename to joplin/rootfs/etc/cont-init.d/00-banner.sh diff --git a/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh b/joplin/rootfs/etc/cont-init.d/00-global_var.sh similarity index 89% rename from fireflyiii_data_importer/rootfs/scripts/00-global_var.sh rename to joplin/rootfs/etc/cont-init.d/00-global_var.sh index b68e3f08b..1798293bd 100644 --- a/fireflyiii_data_importer/rootfs/scripts/00-global_var.sh +++ b/joplin/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 - diff --git a/joplin/rootfs/scripts/99-run.sh b/joplin/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from joplin/rootfs/scripts/99-run.sh rename to joplin/rootfs/etc/cont-init.d/99-run.sh diff --git a/joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh b/joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/joplin/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 1c2a8fc7b..89cc6b06e 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -47,7 +47,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/lidarr/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 diff --git a/mealie/Dockerfile b/mealie/Dockerfile index aec47539d..cc8bdcdb9 100644 --- a/mealie/Dockerfile +++ b/mealie/Dockerfile @@ -41,7 +41,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/mealie/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 diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 211026201..d3e339d7f 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -45,7 +45,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/mylar3/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 diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 8411705d0..f0efac4e9 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -59,7 +59,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/nextcloud/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 diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index 3e7eeda30..a7e064437 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -47,7 +47,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/nzbget/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 diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 6dcc73f64..6b82e169d 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -48,7 +48,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/ombi/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 diff --git a/organizr/Dockerfile b/organizr/Dockerfile index 133abe54a..8c59293ad 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -51,7 +51,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/organizr/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 diff --git a/paperless_ng/Dockerfile b/paperless_ng/Dockerfile index 849a5886e..61123507b 100644 --- a/paperless_ng/Dockerfile +++ b/paperless_ng/Dockerfile @@ -50,7 +50,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/paperless_ng/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 diff --git a/paperless_ng/rootfs/etc/cont-init.d/90-config_yaml.sh b/paperless_ng/rootfs/etc/cont-init.d/90-config_yaml.sh index 4ce48c496..fd2ecb81a 100644 --- a/paperless_ng/rootfs/etc/cont-init.d/90-config_yaml.sh +++ b/paperless_ng/rootfs/etc/cont-init.d/90-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 diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 2c92f871b..a75dbccde 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -46,7 +46,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps 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 e5d1a3331..29a2a88cc 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 @@ -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 diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index b9b1bbeaf..3a32aef5b 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -52,7 +52,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/photoprism/rootfs/00-aaa_dockerfile_backup.sh b/photoprism/rootfs/00-aaa_dockerfile_backup.sh deleted file mode 100644 index 17aecfa6e..000000000 --- a/photoprism/rootfs/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ ! -f "/usr/bin/bashio" ]; then - echo "Bashio does not exist, executing script" - ( - ################ - # Install apps # - ################ - PACKAGES="${PACKAGES:="curl"}" - - apt-get clean \ - && apt-get update \ - && apt-get install -y --no-install-recommends ${PACKAGES} 2>/dev/null \ - || apk add --no-cache ${PACKAGES} - - ################### - # Install bashio # - ################## - - 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/photoprism/rootfs/entrypoint.sh b/photoprism/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/photoprism/rootfs/entrypoint.sh +++ b/photoprism/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" diff --git a/photoprism/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/photoprism/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/photoprism/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/photoprism/rootfs/00-banner.sh b/photoprism/rootfs/etc/cont-init.d/00-banner.sh similarity index 100% rename from photoprism/rootfs/00-banner.sh rename to photoprism/rootfs/etc/cont-init.d/00-banner.sh diff --git a/photoprism/rootfs/92-local_mounts.sh b/photoprism/rootfs/etc/cont-init.d/92-local_mounts.sh similarity index 100% rename from photoprism/rootfs/92-local_mounts.sh rename to photoprism/rootfs/etc/cont-init.d/92-local_mounts.sh diff --git a/photoprism/rootfs/92-smb_mounts.sh b/photoprism/rootfs/etc/cont-init.d/92-smb_mounts.sh similarity index 100% rename from photoprism/rootfs/92-smb_mounts.sh rename to photoprism/rootfs/etc/cont-init.d/92-smb_mounts.sh diff --git a/photoprism/rootfs/scripts/99-run.sh b/photoprism/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from photoprism/rootfs/scripts/99-run.sh rename to photoprism/rootfs/etc/cont-init.d/99-run.sh diff --git a/photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh b/photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/photoprism/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/photoprism/rootfs/scripts/92-smb_mounts.sh b/photoprism/rootfs/scripts/92-smb_mounts.sh deleted file mode 100644 index 06410e554..000000000 --- a/photoprism/rootfs/scripts/92-smb_mounts.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/with-contenv bashio - -######################### -# MOUNT SMB SHARES v1.6 # -######################### -if bashio::config.has_value 'networkdisks'; then - - # Define variables - MOREDISKS=$(bashio::config 'networkdisks') - CIFS_USERNAME=$(bashio::config 'cifsusername') - CIFS_PASSWORD=$(bashio::config 'cifspassword') - MOUNTED=false - SMBVERS="" - SECVERS="" - - # Mount CIFS Share if configured and if Protection Mode is active - echo 'Mounting smb share(s)...' - - if bashio::config.has_value 'cifsdomain'; then - DOMAIN=",domain=$(bashio::config 'cifsdomain')" - else - DOMAIN="" - fi - - # Mounting disks - for disk in ${MOREDISKS//,/ }; do # Separate comma separated values - - # Clean name of network share - disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name - diskname=${disk//\\//} #replace \ with / - diskname=${diskname##*/} # Get only last part of the name - - # Data validation - if [[ ! $disk =~ ^.*+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[/]+.*+$ ]]; then - bashio::log.fatal "The structure of your \"networkdisks\" option : \"$disk\" doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2. If you don't use it, you can simply remove the text, this will avoid this error message in the future." - exit 0 - fi - - # Prepare mount point - mkdir -p /mnt/$diskname - chown -R root:root /mnt/$diskname - - #Tries to mount with default options - mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false - - # if Fail test different smb and sec versions - if [ $MOUNTED = false ]; then - for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do - mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false - for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do - mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false - done - done - fi - - # Messages - if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then - #Test write permissions - touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && - bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || - bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw" - - else - # Mounting failed messages - bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" - bashio::log.fatal "Here is some debugging info :" - - # Provide debugging info - smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client - #smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true - smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true - - # Error code - bashio::log.fatal "Error read : $(/dev/null || true - rmdir /mnt/$diskname || true - fi - - done -fi diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 28a789647..539ed6df1 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -44,7 +44,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/piwigo/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 diff --git a/plex/Dockerfile b/plex/Dockerfile index 261bb0517..88f524d15 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -59,7 +59,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/plex/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 diff --git a/portainer/Dockerfile b/portainer/Dockerfile index 45085a06c..47b665648 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -59,7 +59,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/portainer/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 diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index f8e25ca99..8d56403df 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -48,7 +48,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/prowlarr/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 diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index f72bfbcd1..426631c8e 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -64,7 +64,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps 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 e5d1a3331..29a2a88cc 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 @@ -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 diff --git a/radarr/Dockerfile b/radarr/Dockerfile index b3125c9f8..1e310f2d7 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -48,7 +48,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/radarr/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 diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 2a940d2f6..f6872efb3 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -46,7 +46,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/readarr/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 diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 6cd165759..1a8d88050 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -47,7 +47,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/requestrr/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 diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index f36218c8f..b149e1d23 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -57,7 +57,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/resiliosync/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 diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index fc0eff094..1e32582b5 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -50,7 +50,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/scrutiny/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 diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index d1056e13b..b42eee91a 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -48,7 +48,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/sonarr/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 diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile index 910429c79..e7f63fbb9 100644 --- a/tandoor_recipes/Dockerfile +++ b/tandoor_recipes/Dockerfile @@ -38,7 +38,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/tandoor_recipes/rootfs/entrypoint.sh b/tandoor_recipes/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/tandoor_recipes/rootfs/entrypoint.sh +++ b/tandoor_recipes/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" diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/tandoor_recipes/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/tandoor_recipes/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/tandoor_recipes/rootfs/scripts/20-folders.sh b/tandoor_recipes/rootfs/etc/cont-init.d/20-folders.sh similarity index 100% rename from tandoor_recipes/rootfs/scripts/20-folders.sh rename to tandoor_recipes/rootfs/etc/cont-init.d/20-folders.sh diff --git a/tandoor_recipes/rootfs/scripts/99-run.sh b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from tandoor_recipes/rootfs/scripts/99-run.sh rename to tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh diff --git a/tandoor_recipes/rootfs/scripts/00-aaa_dockerfile_backup.sh b/tandoor_recipes/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/tandoor_recipes/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile index d89071a64..51fad79a8 100644 --- a/teamspeak/Dockerfile +++ b/teamspeak/Dockerfile @@ -43,7 +43,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/teamspeak/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 diff --git a/transmission/Dockerfile b/transmission/Dockerfile index fe389e500..847068d68 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -50,7 +50,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/transmission/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/transmission/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/transmission/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/transmission/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 diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index f14fd4a31..d3a2cadc5 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -55,7 +55,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/ubooquity/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 diff --git a/webtop/Dockerfile b/webtop/Dockerfile index d26cdc992..8564d3fd7 100644 --- a/webtop/Dockerfile +++ b/webtop/Dockerfile @@ -50,7 +50,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/webtop/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/webtop/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/webtop/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/webtop/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 diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index e5b18ad7c..6b5348afb 100644 --- a/webtrees/Dockerfile +++ b/webtrees/Dockerfile @@ -46,7 +46,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/webtrees/rootfs/entrypoint.sh b/webtrees/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/webtrees/rootfs/entrypoint.sh +++ b/webtrees/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" diff --git a/webtrees/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/webtrees/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/webtrees/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/photoprism/rootfs/scripts/00-banner.sh b/webtrees/rootfs/etc/cont-init.d/00-banner.sh similarity index 100% rename from photoprism/rootfs/scripts/00-banner.sh rename to webtrees/rootfs/etc/cont-init.d/00-banner.sh diff --git a/webtrees/rootfs/scripts/90-config_yaml.sh b/webtrees/rootfs/etc/cont-init.d/90-config_yaml.sh similarity index 93% rename from webtrees/rootfs/scripts/90-config_yaml.sh rename to webtrees/rootfs/etc/cont-init.d/90-config_yaml.sh index 4ce48c496..fd2ecb81a 100644 --- a/webtrees/rootfs/scripts/90-config_yaml.sh +++ b/webtrees/rootfs/etc/cont-init.d/90-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 diff --git a/photoprism/rootfs/scripts/92-local_mounts.sh b/webtrees/rootfs/etc/cont-init.d/92-local_mounts.sh similarity index 100% rename from photoprism/rootfs/scripts/92-local_mounts.sh rename to webtrees/rootfs/etc/cont-init.d/92-local_mounts.sh diff --git a/webtrees/rootfs/scripts/92-smb_mounts.sh b/webtrees/rootfs/etc/cont-init.d/92-smb_mounts.sh similarity index 100% rename from webtrees/rootfs/scripts/92-smb_mounts.sh rename to webtrees/rootfs/etc/cont-init.d/92-smb_mounts.sh diff --git a/webtrees/rootfs/scripts/99-custom_script.sh b/webtrees/rootfs/etc/cont-init.d/99-custom_script.sh similarity index 100% rename from webtrees/rootfs/scripts/99-custom_script.sh rename to webtrees/rootfs/etc/cont-init.d/99-custom_script.sh diff --git a/webtrees/rootfs/scripts/99-run.sh b/webtrees/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from webtrees/rootfs/scripts/99-run.sh rename to webtrees/rootfs/etc/cont-init.d/99-run.sh diff --git a/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh b/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/webtrees/rootfs/scripts/92-local_mounts.sh b/webtrees/rootfs/scripts/92-local_mounts.sh deleted file mode 100644 index 0920d68bd..000000000 --- a/webtrees/rootfs/scripts/92-local_mounts.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/with-contenv bashio - -###################### -# MOUNT LOCAL SHARES # -###################### - -# Mount local Share if configured -if bashio::config.has_value 'localdisks'; then - - MOREDISKS=$(bashio::config 'localdisks') - echo "Local Disks mounting..." - - # Separate comma separated values - for disk in ${MOREDISKS//,/ }; do - - # Mount by device as default - devpath=/dev - - # Mount as label - [ ${disk:0:2} != "sd" ] && devpath=/dev/disk/by-label - - # Creates dir - mkdir -p /mnt/$disk - chown -R $(id -u):$(id -g) /mnt/$disk - # Legacy mounting : mount to share if still exists (avoid breaking changes) - [ -d /share/$disk ] && mount $devpath/$disk /share/$disk || true - # Mount - mount $devpath/$disk /mnt/$disk && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) - - done - -fi diff --git a/wger/Dockerfile b/wger/Dockerfile index 29ac160df..17e7c7617 100644 --- a/wger/Dockerfile +++ b/wger/Dockerfile @@ -43,7 +43,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/wger/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/wger/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/wger/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/wger/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 diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile index 92404efa8..80e4e1faa 100644 --- a/whoogle/Dockerfile +++ b/whoogle/Dockerfile @@ -39,7 +39,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/whoogle/rootfs/entrypoint.sh b/whoogle/rootfs/entrypoint.sh index 0a4d34c5f..ba3d7c058 100644 --- a/whoogle/rootfs/entrypoint.sh +++ b/whoogle/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" diff --git a/whoogle/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/whoogle/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..29a2a88cc --- /dev/null +++ b/whoogle/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ -e "/MODULESFILE" ]; then + echo "Executing modules script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE + ) >/dev/null + +fi + +if [ -e "/ENVFILE" ]; then + echo "Executing script" + PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "$PACKAGES" && + rm /automatic_packages.sh + ) >/dev/null + +fi diff --git a/webtrees/rootfs/scripts/00-banner.sh b/whoogle/rootfs/etc/cont-init.d/00-banner.sh similarity index 100% rename from webtrees/rootfs/scripts/00-banner.sh rename to whoogle/rootfs/etc/cont-init.d/00-banner.sh diff --git a/joplin/rootfs/scripts/00-global_var.sh b/whoogle/rootfs/etc/cont-init.d/00-global_var.sh similarity index 89% rename from joplin/rootfs/scripts/00-global_var.sh rename to whoogle/rootfs/etc/cont-init.d/00-global_var.sh index b68e3f08b..1798293bd 100644 --- a/joplin/rootfs/scripts/00-global_var.sh +++ b/whoogle/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 - diff --git a/whoogle/rootfs/scripts/90-config_yaml.sh b/whoogle/rootfs/etc/cont-init.d/90-config_yaml.sh similarity index 98% rename from whoogle/rootfs/scripts/90-config_yaml.sh rename to whoogle/rootfs/etc/cont-init.d/90-config_yaml.sh index b9c3a9577..375fa3dab 100644 --- a/whoogle/rootfs/scripts/90-config_yaml.sh +++ b/whoogle/rootfs/etc/cont-init.d/90-config_yaml.sh @@ -84,7 +84,6 @@ # 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 diff --git a/whoogle/rootfs/scripts/99-run.sh b/whoogle/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from whoogle/rootfs/scripts/99-run.sh rename to whoogle/rootfs/etc/cont-init.d/99-run.sh diff --git a/whoogle/rootfs/scripts/00-aaa_dockerfile_backup.sh b/whoogle/rootfs/scripts/00-aaa_dockerfile_backup.sh deleted file mode 100644 index e5d1a3331..000000000 --- a/whoogle/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# If dockerfile failed install manually -if [ -e "/MODULESFILE" ]; then - echo "Executing modules script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - 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 - -fi - -if [ -e "/ENVFILE" ]; then - echo "Executing script" - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && - chmod 777 /automatic_packages.sh && - eval /./automatic_packages.sh "$PACKAGES" && - rm /automatic_packages.sh - ) >/dev/null - -fi diff --git a/whoogle/rootfs/scripts/00-banner.sh b/whoogle/rootfs/scripts/00-banner.sh deleted file mode 100644 index 0ac294e9a..000000000 --- a/whoogle/rootfs/scripts/00-banner.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Displays a simple add-on banner on startup -# ============================================================================== - -if bashio::supervisor.ping; then - bashio::log.blue \ - '-----------------------------------------------------------' - bashio::log.blue " Add-on: $(bashio::addon.name)" - bashio::log.blue " $(bashio::addon.description)" - bashio::log.blue \ - '-----------------------------------------------------------' - - bashio::log.blue " Add-on version: $(bashio::addon.version)" - if bashio::var.true "$(bashio::addon.update_available)"; then - bashio::log.magenta ' There is an update available for this add-on!' - bashio::log.magenta \ - " Latest add-on version: $(bashio::addon.version_latest)" - bashio::log.magenta ' Please consider upgrading as soon as possible.' - else - bashio::log.green ' You are running the latest version of this add-on.' - fi - - bashio::log.blue " System: $(bashio::info.operating_system)" \ - " ($(bashio::info.arch) / $(bashio::info.machine))" - bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)" - bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)" - - bashio::log.blue \ - '-----------------------------------------------------------' - bashio::log.blue \ - ' Please, share the above information when looking for help' - bashio::log.blue \ - ' or support in, e.g., GitHub, forums' - bashio::log.green \ - ' https://github.com/alexbelgium/hassio-addons' - bashio::log.blue \ - '-----------------------------------------------------------' -fi diff --git a/xteve/Dockerfile b/xteve/Dockerfile index 74bd41ef3..54f8996c7 100644 --- a/xteve/Dockerfile +++ b/xteve/Dockerfile @@ -42,7 +42,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get 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 # Manual apps diff --git a/xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index e5d1a3331..29a2a88cc 100644 --- a/xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/xteve/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 diff --git a/zzz_templates/00-aaa_dockerfile_backup.sh b/zzz_templates/00-aaa_dockerfile_backup.sh index b187cc5eb..29a2a88cc 100644 --- a/zzz_templates/00-aaa_dockerfile_backup.sh +++ b/zzz_templates/00-aaa_dockerfile_backup.sh @@ -1,5 +1,4 @@ #!/bin/bash - # If dockerfile failed install manually if [ -e "/MODULESFILE" ]; then echo "Executing modules script" @@ -8,13 +7,12 @@ if [ -e "/MODULESFILE" ]; then ############################## # Automatic modules download # ############################## - 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); 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); fi && \ - 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 + 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); 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); fi && + 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 && + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" >/MODULESFILE ) >/dev/null fi @@ -32,7 +30,6 @@ if [ -e "/ENVFILE" ]; then chmod 777 /automatic_packages.sh && eval /./automatic_packages.sh "$PACKAGES" && rm /automatic_packages.sh - ) >/dev/null fi diff --git a/zzz_templates/00-global_var.sh b/zzz_templates/00-global_var.sh index e88ad363a..0d845ccef 100644 --- a/zzz_templates/00-global_var.sh +++ b/zzz_templates/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 ################ diff --git a/zzz_templates/90-config_yaml.sh b/zzz_templates/90-config_yaml.sh index 4ce48c496..fd2ecb81a 100644 --- a/zzz_templates/90-config_yaml.sh +++ b/zzz_templates/90-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 diff --git a/zzz_templates/automatic_packages.sh b/zzz_templates/automatic_packages.sh index 60c0b0aba..b75ee6a1e 100644 --- a/zzz_templates/automatic_packages.sh +++ b/zzz_templates/automatic_packages.sh @@ -40,7 +40,7 @@ PACKAGES="$PACKAGES jq curl" ################################## # Scripts -for files in "/etc/cont-init.d" "/etc/services.d" "/scripts"; do +for files in "/etc/cont-init.d" "/etc/services.d"; do # Next directory if does not exists if ! ls $files 1>/dev/null 2>&1; then continue; fi @@ -164,7 +164,7 @@ fi # INSTALL MANUAL APPS # ####################### -for files in "/scripts" "/etc/services.d" "/etc/cont-init.d"; do +for files in "/etc/services.d" "/etc/cont-init.d"; do # Next directory if does not exists if ! ls $files 1>/dev/null 2>&1; then continue; fi