🔨 Migrate old-style base scripts s6-rc (#476)

ssh/rootfs/etc/cont-init.d/docker.sh → ssh/rootfs/etc/s6-overlay/s6-rc.d/init-docker/run

@@ -1,4 +1,6 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
+# shellcheck disable=SC2207
 # ==============================================================================
 # Home Assistant Community Add-on: SSH & Web Terminal
 # Enables Docker by moving the Docker executable in place.

ssh/rootfs/etc/s6-overlay/s6-rc.d/init-docker/type

@@ -0,0 +1 @@
+oneshot

ssh/rootfs/etc/s6-overlay/s6-rc.d/init-docker/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-docker/run

ssh/rootfs/etc/cont-init.d/mosquitto.sh → ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/run

@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: SSH & Web Terminal
 # Pre-configures the Mosquitto clients, if the service is available

ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/type

@@ -0,0 +1 @@
+oneshot

ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mosquitto/run

ssh/rootfs/etc/cont-init.d/mysql.sh → ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/run

@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: SSH & Web Terminal
 # Pre-configures the MySQL clients, if the service is available

ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/type

@@ -0,0 +1 @@
+oneshot

ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mysql/run

ssh/rootfs/etc/cont-init.d/ssh.sh → ssh/rootfs/etc/s6-overlay/s6-rc.d/init-ssh/run

@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: SSH & Web Terminal
 # Configures the SSH daemon

ssh/rootfs/etc/s6-overlay/s6-rc.d/init-ssh/type

@@ -0,0 +1 @@
+oneshot

ssh/rootfs/etc/s6-overlay/s6-rc.d/init-ssh/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-ssh/run

ssh/rootfs/etc/cont-init.d/user.sh → ssh/rootfs/etc/s6-overlay/s6-rc.d/init-user/run

@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: SSH & Web Terminal
 # Executes configured customizations & persists user settings

ssh/rootfs/etc/s6-overlay/s6-rc.d/init-user/type

@@ -0,0 +1 @@
+oneshot

ssh/rootfs/etc/s6-overlay/s6-rc.d/init-user/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-user/run

ssh/rootfs/etc/s6-overlay/s6-rc.d/sshd/finish

@@ -0,0 +1,27 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Community Add-on: SSH & Web Terminal
+# Take down the S6 supervision tree when the SSH 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="SSH"
+
+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

ssh/rootfs/etc/services.d/sshd/run → ssh/rootfs/etc/s6-overlay/s6-rc.d/sshd/run

@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: SSH & Web Terminal
 # Starts the SSH service

ssh/rootfs/etc/s6-overlay/s6-rc.d/sshd/type

@@ -0,0 +1 @@
+longrun

ssh/rootfs/etc/s6-overlay/s6-rc.d/ttyd/finish

@@ -0,0 +1,26 @@
+#!/command/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: SSH & Web Terminal
+# Take down the S6 supervision tree when the ttyd 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="ttyd"
+
+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

ssh/rootfs/etc/services.d/ttyd/run → ssh/rootfs/etc/s6-overlay/s6-rc.d/ttyd/run

@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: SSH & Web Terminal
 # Runs the ttyd daemon

ssh/rootfs/etc/s6-overlay/s6-rc.d/ttyd/type

@@ -0,0 +1 @@
+longrun