From 6236af0e3bb68848a1bb9eba3362b462e936953b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 13 Nov 2022 00:13:58 +0000 Subject: [PATCH] Github bot : script beautyshied --- .templates/90-config_yaml.sh | 6 +++--- scrutiny/rootfs/etc/cont-init.d/01-run.sh | 12 ++++++------ scrutiny_fa/rootfs/etc/cont-init.d/01-run.sh | 12 ++++++------ webtrees/rootfs/etc/cont-init.d/99-run.sh | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.templates/90-config_yaml.sh b/.templates/90-config_yaml.sh index ecd905066..ec32c431e 100644 --- a/.templates/90-config_yaml.sh +++ b/.templates/90-config_yaml.sh @@ -114,9 +114,9 @@ while IFS= read -r line; do sed -i "1a export $line" /scripts/*run* 2>/dev/null || true # export on python if command -v "python3" &>/dev/null; then - [ ! -f /env.py ] && echo "import os" > /env.py - echo "os.environ['${line%%=*}'] = '${line#*=}'" >> /env.py - python3 /env.py + [ ! -f /env.py ] && echo "import os" > /env.py + echo "os.environ['${line%%=*}'] = '${line#*=}'" >> /env.py + python3 /env.py fi # set .env echo "$line" >> /.env || true diff --git a/scrutiny/rootfs/etc/cont-init.d/01-run.sh b/scrutiny/rootfs/etc/cont-init.d/01-run.sh index 60b80e39b..f9a5d3434 100644 --- a/scrutiny/rootfs/etc/cont-init.d/01-run.sh +++ b/scrutiny/rootfs/etc/cont-init.d/01-run.sh @@ -62,11 +62,11 @@ esac ######## if [[ "$(bashio::config "Mode")" == Collector ]]; then - bashio::log.warning "Collector only mode. WebUI and Influxdb will be disabled" - rm -r /etc/services.d/influxdb - rm -r /etc/services.d/scrutiny - rm -r /etc/services.d/nginx - sed -i "/wait/d" /etc/services.d/collector-once/run - sed -i "/scrutiny api not ready/d" /etc/services.d/collector-once/run + bashio::log.warning "Collector only mode. WebUI and Influxdb will be disabled" + rm -r /etc/services.d/influxdb + rm -r /etc/services.d/scrutiny + rm -r /etc/services.d/nginx + sed -i "/wait/d" /etc/services.d/collector-once/run + sed -i "/scrutiny api not ready/d" /etc/services.d/collector-once/run fi diff --git a/scrutiny_fa/rootfs/etc/cont-init.d/01-run.sh b/scrutiny_fa/rootfs/etc/cont-init.d/01-run.sh index 75f5d8a86..44d5bb4eb 100644 --- a/scrutiny_fa/rootfs/etc/cont-init.d/01-run.sh +++ b/scrutiny_fa/rootfs/etc/cont-init.d/01-run.sh @@ -68,11 +68,11 @@ esac ######## if [[ "$(bashio::config "Mode")" == Collector ]]; then - bashio::log.warning "Collector only mode. WebUI and Influxdb will be disabled" - rm -r /etc/services.d/influxdb - rm -r /etc/services.d/scrutiny - rm -r /etc/services.d/nginx - sed -i "/wait/d" /etc/services.d/collector-once/run - sed -i "/scrutiny api not ready/d" /etc/services.d/collector-once/run + bashio::log.warning "Collector only mode. WebUI and Influxdb will be disabled" + rm -r /etc/services.d/influxdb + rm -r /etc/services.d/scrutiny + rm -r /etc/services.d/nginx + sed -i "/wait/d" /etc/services.d/collector-once/run + sed -i "/scrutiny api not ready/d" /etc/services.d/collector-once/run fi diff --git a/webtrees/rootfs/etc/cont-init.d/99-run.sh b/webtrees/rootfs/etc/cont-init.d/99-run.sh index 3b11f8d45..d4a4720cb 100644 --- a/webtrees/rootfs/etc/cont-init.d/99-run.sh +++ b/webtrees/rootfs/etc/cont-init.d/99-run.sh @@ -14,7 +14,7 @@ export BASE_URL=$(bashio::config 'BASE_URL'):$(bashio::addon.port 80) ############## if bashio::config.true "base_url_portless"; then - export BASE_URL=$(bashio::config 'BASE_URL') + export BASE_URL=$(bashio::config 'BASE_URL') fi ###################