From 23a783503255e9cbf5101b96fc334705bdbcb77e Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sun, 17 Apr 2022 00:12:26 +0000 Subject: [PATCH] Github bot : script beautyshied --- .../rootfs/etc/cont-init.d/99-run.sh | 2 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 18 +++++++++--------- omada/rootfs/etc/cont-init.d/00-folders.sh | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fireflyiii_fints_importer/rootfs/etc/cont-init.d/99-run.sh b/fireflyiii_fints_importer/rootfs/etc/cont-init.d/99-run.sh index 71e39a17e..4626c45c4 100644 --- a/fireflyiii_fints_importer/rootfs/etc/cont-init.d/99-run.sh +++ b/fireflyiii_fints_importer/rootfs/etc/cont-init.d/99-run.sh @@ -10,7 +10,7 @@ CONFIGSOURCE="/config/addons_config/fireflyiii_fints_importer" if [ "$(ls -A "$CONFIGSOURCE")" ]; then bashio::log.info "Configurations were found in $CONFIGSOURCE, they will be loaded." else - bashio::log.warning "No configurations in $CONFIGSOURCE, you'll need to input the infos manually." + bashio::log.warning "No configurations in $CONFIGSOURCE, you'll need to input the infos manually." fi ################ diff --git a/omada/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/omada/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 98dddfe70..8989b365f 100644 --- a/omada/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/omada/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -11,10 +11,10 @@ if [ -e "/MODULESFILE" ]; then echo "Executing modules script : $MODULES" if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && mkdir -p /etc/cont-init.d \ + && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ + && chmod -R 755 /etc/cont-init.d fi ####################### @@ -25,9 +25,9 @@ if [ -e "/ENVFILE" ]; then echo "Executing dependency script with custom elements : $PACKAGES" if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ + && chmod 777 /automatic_packages.sh \ + && eval /./automatic_packages.sh "${PACKAGES:-}" \ + && rm /automatic_packages.sh fi diff --git a/omada/rootfs/etc/cont-init.d/00-folders.sh b/omada/rootfs/etc/cont-init.d/00-folders.sh index b2ec95897..e41e5cafe 100644 --- a/omada/rootfs/etc/cont-init.d/00-folders.sh +++ b/omada/rootfs/etc/cont-init.d/00-folders.sh @@ -5,8 +5,8 @@ CONFIGSOURCE="/config/addons_config/omada" # Create directory if [ ! -f "$CONFIGSOURCE" ]; then -echo "Creating directory" -mkdir -p "$CONFIGSOURCE" + echo "Creating directory" + mkdir -p "$CONFIGSOURCE" fi # Ensure structure is correct