hassio-addons · frenck · Dec 16, 2022 · Dec 16, 2022
diff --git a/tor/rootfs/etc/s6-overlay/s6-rc.d/init-tor/dependencies.d/base b/tor/rootfs/etc/s6-overlay/s6-rc.d/init-tor/dependencies.d/base
diff --git a/tor/rootfs/etc/cont-init.d/prepare.sh → ...ootfs/etc/s6-overlay/s6-rc.d/init-tor/run b/tor/rootfs/etc/cont-init.d/prepare.sh → ...ootfs/etc/s6-overlay/s6-rc.d/init-tor/run
@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: Tor
 # Prepares the add-on for startup

diff --git a/tor/rootfs/etc/s6-overlay/s6-rc.d/init-tor/type b/tor/rootfs/etc/s6-overlay/s6-rc.d/init-tor/type
@@ -0,0 +1 @@
+oneshot
diff --git a/tor/rootfs/etc/s6-overlay/s6-rc.d/init-tor/up b/tor/rootfs/etc/s6-overlay/s6-rc.d/init-tor/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-tor/run
diff --git a/tor/rootfs/etc/s6-overlay/s6-rc.d/tor/dependencies.d/init-tor b/tor/rootfs/etc/s6-overlay/s6-rc.d/tor/dependencies.d/init-tor
diff --git a/tor/rootfs/etc/s6-overlay/s6-rc.d/tor/finish b/tor/rootfs/etc/s6-overlay/s6-rc.d/tor/finish
@@ -0,0 +1,27 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Community Add-on: Tor
+# Take down the S6 supervision tree when the Tor daemon fails
+# ==============================================================================
+declare exit_code
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+readonly service="Tor"
+
+bashio::log.info \
+ "Service ${service} exited with code ${exit_code_service}" \
+ "(by signal ${exit_code_signal})"
+
+if [[ "${exit_code_service}" -eq 256 ]]; then
+ if [[ "${exit_code_container}" -eq 0 ]]; then
+ echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+ fi
+ [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+ if [[ "${exit_code_container}" -eq 0 ]]; then
+ echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
+ fi
+ exec /run/s6/basedir/bin/halt
+fi
diff --git a/tor/rootfs/etc/services.d/tor/run → tor/rootfs/etc/s6-overlay/s6-rc.d/tor/run b/tor/rootfs/etc/services.d/tor/run → tor/rootfs/etc/s6-overlay/s6-rc.d/tor/run
@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: Tor
 # Runs the Tor daemon

diff --git a/tor/rootfs/etc/s6-overlay/s6-rc.d/tor/type b/tor/rootfs/etc/s6-overlay/s6-rc.d/tor/type
@@ -0,0 +1 @@
+longrun
diff --git a/tor/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-tor b/tor/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-tor
diff --git a/tor/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/tor b/tor/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/tor
diff --git a/tor/rootfs/etc/services.d/tor/finish b/tor/rootfs/etc/services.d/tor/finish