Refactor supervisor to s6-overlay

Author: nedix

rootfs/usr/sbin/s6-stage2-hook

@@ -8,16 +8,20 @@ SERVICES_DIRECTORY=/etc/s6-overlay/s6-rc.d
 
 mkdir "$SCRIPTS_DIRECTORY"
 
-for SERVICE_PATH in $(find "$SERVICES_DIRECTORY" -mindepth 2 -maxdepth 2 -type f \( -name up -o -name run \)); do
-    ENVIRONMENT_DIRECTORY=$(echo "$SERVICE_PATH" | sed -E "s|^${SERVICES_DIRECTORY}/([^/]+)/.*|/run/\1/environment|")
-    SCRIPT_PATH=$(echo "$SERVICE_PATH" | sed -E "s|^${SERVICES_DIRECTORY}/([^/]+)/.*|${SCRIPTS_DIRECTORY}/\1|")
+for SERVICE_PATH in $( \
+    find "$SERVICES_DIRECTORY" -mindepth 2 -maxdepth 2 -type f \
+    \( -name up -o -name down -o -name run -o -name finish \) \
+); do
+    ENVIRONMENT_DIRECTORY=$(echo "$SERVICE_PATH" | sed -E "s|^${SERVICES_DIRECTORY}/([^/]+)/([^/]+)|/run/\1/environment|")
+    SCRIPT_PATH=$(echo "$SERVICE_PATH" | sed -E "s|^${SERVICES_DIRECTORY}/([^/]+)/([^/]+)|${SCRIPTS_DIRECTORY}/\1/\2|")
 
     # Symlink container environment to service environment
     mkdir -p "$ENVIRONMENT_DIRECTORY"
     find "$CONTAINER_ENVIRONMENT_DIRECTORY" -mindepth 1 -maxdepth 1 -type f -exec ln -s {} "$ENVIRONMENT_DIRECTORY" \;
     chmod -R 400 "$ENVIRONMENT_DIRECTORY"
 
     # Move shell script
+    mkdir -p "${SCRIPT_PATH%/*}"
     mv "$SERVICE_PATH" "$SCRIPT_PATH"
     chmod 500 "$SCRIPT_PATH"