avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-01-11 02:11:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow s6 env support

Browse Source
This commit is contained in:
Alexandre
2023-02-12 11:55:38 +01:00
parent 0d697bcd4a
commit 86ba596ef5
12 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
calibre/rootfs/etc/cont-init.d/00-data_location.sh
View File

@@ -44,6 +44,11 @@ sed -i "s|/config/addons_config/calibre|$LOCATION|g" /defaults/* || true
sed -i "s|/config/addons_config/calibre|$LOCATION|g" /etc/cont-init.d/* || true sed -i "s|/config/addons_config/calibre|$LOCATION|g" /etc/cont-init.d/* || true
sed -i "s|/config/addons_config/calibre|$LOCATION|g" /etc/services.d/*/run || true sed -i "s|/config/addons_config/calibre|$LOCATION|g" /etc/services.d/*/run || true
if [ -d /var/run/s6/container_environment ]; then
printf "$LOCATION" > /var/run/s6/container_environment/HOME
printf "$LOCATION" > /var/run/s6/container_environment/FM_HOME
fi
usermod --home "$LOCATION" abc usermod --home "$LOCATION" abc
# Create folder # Create folder

3
calibre/rootfs/etc/cont-init.d/80-configuration.sh
View File

@@ -14,6 +14,7 @@ if bashio::config.has_value 'KEYBOARD'; then
KEYBOARD=$(bashio::config 'KEYBOARD') KEYBOARD=$(bashio::config 'KEYBOARD')
bashio::log.info "Setting keyboard to $KEYBOARD" bashio::log.info "Setting keyboard to $KEYBOARD"
sed -i "1a export KEYBOARD=$KEYBOARD" /etc/s6-overlay/s6-rc.d/svc-web/run sed -i "1a export KEYBOARD=$KEYBOARD" /etc/s6-overlay/s6-rc.d/svc-web/run
if [ -d /var/run/s6/container_environment ]; then printf "$KEYBOARD" > /var/run/s6/container_environment/KEYBOARD; fi
fi || true fi || true
# Set cli args # Set cli args
@@ -22,6 +23,7 @@ if bashio::config.has_value 'CLI_ARGS'; then
CLI_ARGS=$(bashio::config 'CLI_ARGS') CLI_ARGS=$(bashio::config 'CLI_ARGS')
bashio::log.info "Setting arguments to $CLI_ARGS" bashio::log.info "Setting arguments to $CLI_ARGS"
sed -i "1a export CLI_ARGS=$CLI_ARGS" /etc/s6-overlay/s6-rc.d/svc-web/run sed -i "1a export CLI_ARGS=$CLI_ARGS" /etc/s6-overlay/s6-rc.d/svc-web/run
if [ -d /var/run/s6/container_environment ]; then printf "$CLI_ARGS" > /var/run/s6/container_environment/CLI_ARGS; fi
fi || true fi || true
# Set password # Set password
@@ -30,4 +32,5 @@ if bashio::config.has_value 'PASSWORD'; then
PASSWORD=$(bashio::config 'PASSWORD') PASSWORD=$(bashio::config 'PASSWORD')
bashio::log.info "Setting password to $PASSWORD" bashio::log.info "Setting password to $PASSWORD"
sed -i "1a export PASSWORD=$PASSWORD" /etc/s6-overlay/s6-rc.d/svc-web/run sed -i "1a export PASSWORD=$PASSWORD" /etc/s6-overlay/s6-rc.d/svc-web/run
if [ -d /var/run/s6/container_environment ]; then printf "$PASSWORD" > /var/run/s6/container_environment/PASSWORD; fi
fi || true fi || true

3
calibre_web/rootfs/etc/cont-init.d/00-data_location.sh
View File

@@ -36,6 +36,9 @@ sed -i "1a export FM_HOME=$LOCATION" /etc/services.d/*/run
sed -i "s|/config/addons_config/calibre-web|$LOCATION|g" /defaults/* sed -i "s|/config/addons_config/calibre-web|$LOCATION|g" /defaults/*
sed -i "s|/config/addons_config/calibre-web|$LOCATION|g" /etc/cont-init.d/* sed -i "s|/config/addons_config/calibre-web|$LOCATION|g" /etc/cont-init.d/*
sed -i "s|/config/addons_config/calibre-web|$LOCATION|g" /etc/services.d/*/run sed -i "s|/config/addons_config/calibre-web|$LOCATION|g" /etc/services.d/*/run
if [ -d /var/run/s6/container_environment ]; then printf "$LOCATION" > /var/run/s6/container_environment/HOME; fi
if [ -d /var/run/s6/container_environment ]; then printf "$LOCATION" > /var/run/s6/container_environment/FM_HOME; fi
usermod --home "$LOCATION" abc usermod --home "$LOCATION" abc
# Create folder # Create folder

1
enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
View File

@@ -17,6 +17,7 @@ if bashio::config.true 'mqtt_autodiscover'; then
export MQTT_SSL=$(bashio::services mqtt "ssl") || bashio::log.error "can't fetch bashio::services mqtt 'ssl'" export MQTT_SSL=$(bashio::services mqtt "ssl") || bashio::log.error "can't fetch bashio::services mqtt 'ssl'"
export MQTT_USERNAME=$(bashio::services mqtt "username") || bashio::log.error "can't fetch bashio::services mqtt 'username'" export MQTT_USERNAME=$(bashio::services mqtt "username") || bashio::log.error "can't fetch bashio::services mqtt 'username'"
export MQTT_PASSWORD=$(bashio::services mqtt "password") || bashio::log.error "can't fetch bashio::services mqtt 'password'" export MQTT_PASSWORD=$(bashio::services mqtt "password") || bashio::log.error "can't fetch bashio::services mqtt 'password'"
# Export variables # 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 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/cont-init.d/*/*run* 2>/dev/null || true sed -i "1a export $variables" /etc/cont-init.d/*/*run* 2>/dev/null || true

1
enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
View File

@@ -17,6 +17,7 @@ if bashio::config.true 'mqtt_autodiscover'; then
export MQTT_SSL=$(bashio::services mqtt "ssl") || bashio::log.error "can't fetch bashio::services mqtt 'ssl'" export MQTT_SSL=$(bashio::services mqtt "ssl") || bashio::log.error "can't fetch bashio::services mqtt 'ssl'"
export MQTT_USERNAME=$(bashio::services mqtt "username") || bashio::log.error "can't fetch bashio::services mqtt 'username'" export MQTT_USERNAME=$(bashio::services mqtt "username") || bashio::log.error "can't fetch bashio::services mqtt 'username'"
export MQTT_PASSWORD=$(bashio::services mqtt "password") || bashio::log.error "can't fetch bashio::services mqtt 'password'" export MQTT_PASSWORD=$(bashio::services mqtt "password") || bashio::log.error "can't fetch bashio::services mqtt 'password'"
# Export variables # 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 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/cont-init.d/*/*run* 2>/dev/null || true sed -i "1a export $variables" /etc/cont-init.d/*/*run* 2>/dev/null || true

1
gazpar2mqtt/rootfs/etc/cont-init.d/89-mqtt_autodiscover.sh
View File

@@ -21,6 +21,7 @@ if bashio::config.true 'mqtt_autodiscover'; then
export MQTT_USERNAME export MQTT_USERNAME
MQTT_PASSWORD=$(bashio::services mqtt "password") MQTT_PASSWORD=$(bashio::services mqtt "password")
export MQTT_PASSWORD export MQTT_PASSWORD
# Export variables # 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 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 || true sed -i "1a export $variables" /etc/services.d/*/*run* 2>/dev/null || true

1
qbittorrent/rootfs/etc/openvpn/down.sh
View File

@@ -25,6 +25,7 @@ if [ -n "${RC_SVCNAME}" ]; then
# Re-enter the init script to start any dependant services # Re-enter the init script to start any dependant services
if /etc/init.d/"${RC_SVCNAME}" --quiet status ; then if /etc/init.d/"${RC_SVCNAME}" --quiet status ; then
export IN_BACKGROUND=true export IN_BACKGROUND=true
if [ -d /var/run/s6/container_environment ]; then printf "true" > /var/run/s6/container_environment/IN_BACKGROUND; fi
/etc/init.d/"${RC_SVCNAME}" --quiet stop /etc/init.d/"${RC_SVCNAME}" --quiet stop
fi fi
fi fi

1
qbittorrent/rootfs/etc/openvpn/up.sh
View File

@@ -78,6 +78,7 @@ if [ -n "${RC_SVCNAME}" ]; then
# Re-enter the init script to start any dependant services # Re-enter the init script to start any dependant services
if ! /etc/init.d/"${RC_SVCNAME}" --quiet status ; then if ! /etc/init.d/"${RC_SVCNAME}" --quiet status ; then
export IN_BACKGROUND=true export IN_BACKGROUND=true
if [ -d /var/run/s6/container_environment ]; then printf "true" > /var/run/s6/container_environment/IN_BACKGROUND; fi
/etc/init.d/${RC_SVCNAME} --quiet start /etc/init.d/${RC_SVCNAME} --quiet start
fi fi
fi fi

1
scrutiny/rootfs/etc/cont-init.d/90-run.sh
View File

@@ -40,6 +40,7 @@ if [[ "$(bashio::config "Mode")" == Collector ]]; then
if bashio::config.has_value "COLLECTOR_API_ENDPOINT"; then if bashio::config.has_value "COLLECTOR_API_ENDPOINT"; then
echo "export COLLECTOR_API_ENDPOINT=$(bashio::config "COLLECTOR_API_ENDPOINT")" >> /env.sh echo "export COLLECTOR_API_ENDPOINT=$(bashio::config "COLLECTOR_API_ENDPOINT")" >> /env.sh
sed -i "1a export COLLECTOR_API_ENDPOINT=$(bashio::config "COLLECTOR_API_ENDPOINT")" /etc/services.d/collector-once/run sed -i "1a export COLLECTOR_API_ENDPOINT=$(bashio::config "COLLECTOR_API_ENDPOINT")" /etc/services.d/collector-once/run
if [ -d /var/run/s6/container_environment ]; then printf "$COLLECTOR_API_ENDPOINT" > /var/run/s6/container_environment/COLLECTOR_API_ENDPOINT; fi
bashio::log.info "Using 'COLLECTOR_API_ENDPOINT' $(bashio::config "COLLECTOR_API_ENDPOINT")" bashio::log.info "Using 'COLLECTOR_API_ENDPOINT' $(bashio::config "COLLECTOR_API_ENDPOINT")"
else else
bashio::exit.nok "Mode is set to 'Collector', but 'COLLECTOR_API_ENDPOINT' is not defined" bashio::exit.nok "Mode is set to 'Collector', but 'COLLECTOR_API_ENDPOINT' is not defined"

1
scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh
View File

@@ -62,6 +62,7 @@ case "$FREQUENCY" in
sed -i "1a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * 0\"" /etc/cont-init.d/50-cron-config sed -i "1a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * 0\"" /etc/cont-init.d/50-cron-config
;; ;;
esac esac
############################ ############################
# SMARTCTL COMMAND OPTIONS # # SMARTCTL COMMAND OPTIONS #
############################ ############################

2
webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh
View File

@@ -39,6 +39,8 @@ sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /defaults -type f) || true
sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/cont-init.d -type f) || true sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/cont-init.d -type f) || true
sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/services.d -type f) || true sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/services.d -type f) || true
sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/s6-overlay/s6-rc.d -type f) || true sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/s6-overlay/s6-rc.d -type f) || true
if [ -d /var/run/s6/container_environment ]; then printf "$LOCATION" > /var/run/s6/container_environment/HOME; fi
if [ -d /var/run/s6/container_environment ]; then printf "$LOCATION" > /var/run/s6/container_environment/FM_HOME; fi
usermod --home "$LOCATION" abc usermod --home "$LOCATION" abc

1
webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh
View File

@@ -48,6 +48,7 @@ if bashio::config.has_value 'KEYBOARD'; then
KEYBOARD=$(bashio::config 'KEYBOARD') KEYBOARD=$(bashio::config 'KEYBOARD')
bashio::log.info "Setting keyboard to $KEYBOARD" bashio::log.info "Setting keyboard to $KEYBOARD"
sed -i "1a export KEYBOARD=$KEYBOARD" /etc/s6-overlay/s6-rc.d/svc-web/run sed -i "1a export KEYBOARD=$KEYBOARD" /etc/s6-overlay/s6-rc.d/svc-web/run
if [ -d /var/run/s6/container_environment ]; then printf "$KEYBOARD" > /var/run/s6/container_environment/KEYBOARD; fi
fi fi
# Set password # Set password