diff --git a/rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh b/rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh index a7957d0..34d9fbb 100755 --- a/rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh +++ b/rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh @@ -21,7 +21,7 @@ # shellcheck disable=SC1003,SC2016,SC2031,SC2120,SC2155,SC2199,SC2317 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Exit if service is disabled -[ -z "$TOR_BRIDGE_ENABLED" ] || [ "$TOR_BRIDGE_ENABLED" != "no" ] || [ "$TOR_BRIDGE_ENABLED" != "false" ] || exit 0 +[ -z "$TOR_BRIDGE_ENABLED" ] || { [ "$TOR_BRIDGE_ENABLED" != "no" ] && [ "$TOR_BRIDGE_ENABLED" != "false" ]; } || exit 0 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # run trap command on exit trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' SIGINT SIGTERM diff --git a/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh b/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh index e490556..8760639 100755 --- a/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh +++ b/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh @@ -21,7 +21,7 @@ # shellcheck disable=SC1003,SC2016,SC2031,SC2120,SC2155,SC2199,SC2317 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Exit if service is disabled -[ -z "$TOR_RELAY_ENABLED" ] || [ "$TOR_RELAY_ENABLED" != "no" ] || [ "$TOR_RELAY_ENABLED" != "false" ] || exit 0 +[ -z "$TOR_RELAY_ENABLED" ] || { [ "$TOR_RELAY_ENABLED" != "no" ] && [ "$TOR_RELAY_ENABLED" != "false" ]; } || exit 0 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # run trap command on exit trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' SIGINT SIGTERM