mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-01-10 09:51:02 +01:00
Refactor
This commit is contained in:
Alexandre
@@ -7,7 +7,7 @@ set -Eeuo pipefail
|
||||
echo "Starting..."
|
||||
|
||||
####################
|
||||
# Starting scripts #
|
||||
# Global Variables #
|
||||
####################
|
||||
|
||||
PID1=false
|
||||
@@ -15,85 +15,221 @@ if [ "$$" -eq 1 ]; then
|
||||
PID1=true
|
||||
fi
|
||||
|
||||
# Cache command availability at startup
|
||||
readonly HAS_S6_SETUIDGID=$(command -v s6-setuidgid > /dev/null 2>&1 && echo true || echo false)
|
||||
readonly HAS_PGREP=$(command -v pgrep > /dev/null 2>&1 && echo true || echo false)
|
||||
readonly IS_ROOT=$([ "$(id -u)" -eq 0 ] && echo true || echo false)
|
||||
readonly IS_TTY=$([ -t 1 ] && echo true || echo false)
|
||||
|
||||
# Pre-build available interpreters list
|
||||
AVAILABLE_INTERPRETERS=()
|
||||
SHEBANG_LIST="/usr/bin/bashio /usr/bin/bash /usr/bin/sh /bin/bash /bin/sh"
|
||||
if ! "$PID1"; then
|
||||
SHEBANG_LIST="/usr/bin/with-contenv bashio /command/with-contenv bashio $SHEBANG_LIST"
|
||||
fi
|
||||
|
||||
for shebang in $SHEBANG_LIST; do
|
||||
local command_path="${shebang%% *}"
|
||||
if [ -x "$command_path" ] && "$command_path" echo "yes" > /dev/null 2>&1; then
|
||||
AVAILABLE_INTERPRETERS+=("$shebang")
|
||||
fi
|
||||
done
|
||||
|
||||
####################
|
||||
# Helper Functions #
|
||||
####################
|
||||
|
||||
log_warning() {
|
||||
local message="$1"
|
||||
if "$IS_TTY"; then
|
||||
echo -e "\e[38;5;214m$(date) WARNING: $message\e[0m"
|
||||
else
|
||||
echo "$(date) WARNING: $message"
|
||||
fi
|
||||
}
|
||||
|
||||
log_error() {
|
||||
local message="$1"
|
||||
echo -e "\033[0;31mError\033[0m : $message"
|
||||
}
|
||||
|
||||
fix_shebang() {
|
||||
local runfile="$1"
|
||||
|
||||
# Get current shebang
|
||||
local currentshebang
|
||||
currentshebang="$(sed -n '1{s/^#![[:blank:]]*//p;q}' "$runfile")"
|
||||
|
||||
# Check if interpreter exists
|
||||
if [ -f "${currentshebang%% *}" ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Find first available interpreter
|
||||
for shebang in "${AVAILABLE_INTERPRETERS[@]}"; do
|
||||
echo "Valid shebang: $shebang"
|
||||
sed -i "1s|.*|#!$shebang|" "$runfile"
|
||||
return 0
|
||||
done
|
||||
|
||||
log_warning "No valid interpreter found for $runfile"
|
||||
return 1
|
||||
}
|
||||
|
||||
apply_script_modifications() {
|
||||
local runfile="$1"
|
||||
local sed_commands=()
|
||||
|
||||
# Build sed command array based on conditions
|
||||
if ! "$IS_ROOT"; then
|
||||
sed_commands+=(
|
||||
'-e' 's/^([[:space:]]*)chown /\1true # chown /'
|
||||
'-e' 's/^([[:space:]]*)chmod /\1true # chmod /'
|
||||
)
|
||||
fi
|
||||
|
||||
if ! "$HAS_S6_SETUIDGID"; then
|
||||
sed_commands+=(
|
||||
'-e' 's|s6-setuidgid[[:space:]]+([a-zA-Z0-9._-]+)[[:space:]]+(.*)$|su -s /bin/bash \1 -c "\2"|g'
|
||||
)
|
||||
fi
|
||||
|
||||
if [ "${ha_entry_source:-null}" = true ]; then
|
||||
sed_commands+=(
|
||||
'-e' 's/(^|[[:space:]])exit ([0-9]+)/\1return \2 || exit \2/g'
|
||||
'-e' 's/bashio::exit.nok/return 1/g'
|
||||
'-e' 's/bashio::exit.ok/return 0/g'
|
||||
)
|
||||
fi
|
||||
|
||||
# Apply all modifications in a single sed call if any are needed
|
||||
if [ ${#sed_commands[@]} -gt 0 ]; then
|
||||
sed -i -E "${sed_commands[@]}" "$runfile"
|
||||
fi
|
||||
}
|
||||
|
||||
set_permissions() {
|
||||
local runfile="$1"
|
||||
|
||||
if "$IS_ROOT"; then
|
||||
chown "$(id -u)":"$(id -g)" "$runfile"
|
||||
chmod a+x "$runfile"
|
||||
else
|
||||
log_warning "Script executed as UID $(id -u), chown/chmod may fail"
|
||||
fi
|
||||
}
|
||||
|
||||
####################
|
||||
# Main Functions #
|
||||
####################
|
||||
|
||||
run_script() {
|
||||
local runfile="$1"
|
||||
local script_kind="$2"
|
||||
|
||||
echo "$runfile: executing"
|
||||
|
||||
# FIX: Correct current shebang parsing
|
||||
local currentshebang
|
||||
currentshebang="$(sed -n '1{s/^#![[:blank:]]*//p;q}' "$runfile")"
|
||||
|
||||
# IMPROVED: Fix shebang if interpreter missing
|
||||
if [ ! -f "${currentshebang%% *}" ]; then
|
||||
local shebanglist="/usr/bin/bashio /usr/bin/bash /usr/bin/sh /bin/bash /bin/sh"
|
||||
if ! "$PID1"; then
|
||||
shebanglist="/usr/bin/with-contenv bashio /command/with-contenv bashio $shebanglist"
|
||||
fi
|
||||
for shebang in $shebanglist; do
|
||||
local command_path="${shebang%% *}"
|
||||
if [ -x "$command_path" ] && "$command_path" echo "yes" > /dev/null 2>&1; then
|
||||
echo "Valid shebang: $shebang"
|
||||
sed -i "1s|.*|#!$shebang|" "$runfile"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Check if run as root
|
||||
if [ "$(id -u)" -eq 0 ]; then
|
||||
chown "$(id -u)":"$(id -g)" "$runfile"
|
||||
chmod a+x "$runfile"
|
||||
else
|
||||
if [ -t 1 ]; then
|
||||
echo -e "\e[38;5;214m$(date) WARNING: Script executed as UID $(id -u), chown/chmod may fail\e[0m"
|
||||
else
|
||||
echo "$(date) WARNING: Script executed as UID $(id -u), chown/chmod may fail"
|
||||
fi
|
||||
# Disable chown/chmod in script
|
||||
sed -i -E 's/^([[:space:]]*)chown /\1true # chown /' "$runfile"
|
||||
sed -i -E 's/^([[:space:]]*)chmod /\1true # chmod /' "$runfile"
|
||||
fi
|
||||
|
||||
# Replace s6-setuidgid with su fallback if s6-setuidgid is missing
|
||||
if ! command -v s6-setuidgid > /dev/null 2>&1; then
|
||||
sed -i -E 's|s6-setuidgid[[:space:]]+([a-zA-Z0-9._-]+)[[:space:]]+(.*)$|su -s /bin/bash \1 -c "\2"|g' "$runfile"
|
||||
fi
|
||||
# Fix shebang if needed
|
||||
fix_shebang "$runfile"
|
||||
|
||||
# Set permissions
|
||||
set_permissions "$runfile"
|
||||
|
||||
# Apply script modifications
|
||||
apply_script_modifications "$runfile"
|
||||
|
||||
# Execute script
|
||||
if [[ "$script_kind" == service ]]; then
|
||||
"$runfile" &
|
||||
else
|
||||
if [ "${ha_entry_source:-null}" = true ]; then
|
||||
sed -Ei 's/(^|[[:space:]])exit ([0-9]+)/\1return \2 || exit \2/g' "$runfile"
|
||||
sed -i "s/bashio::exit.nok/return 1/g" "$runfile"
|
||||
sed -i "s/bashio::exit.ok/return 0/g" "$runfile"
|
||||
source "$runfile" || echo -e "\033[0;31mError\033[0m : $runfile exiting $?"
|
||||
else
|
||||
"$runfile" || echo -e "\033[0;31mError\033[0m : $runfile exiting $?"
|
||||
fi
|
||||
fi
|
||||
case "$script_kind" in
|
||||
service)
|
||||
"$runfile" &
|
||||
;;
|
||||
script)
|
||||
if [ "${ha_entry_source:-null}" = true ]; then
|
||||
source "$runfile" || log_error "$runfile exiting $?"
|
||||
else
|
||||
"$runfile" || log_error "$runfile exiting $?"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# Cleanup only temporary scripts
|
||||
# Cleanup temporary scripts
|
||||
if [[ "$script_kind" != service && "$runfile" == /tmp/* ]]; then
|
||||
rm -f "$runfile"
|
||||
fi
|
||||
}
|
||||
|
||||
# Loop through /etc/cont-init.d/*
|
||||
for SCRIPTS in /etc/cont-init.d/*; do
|
||||
[ -e "$SCRIPTS" ] || continue
|
||||
run_script "$SCRIPTS" script
|
||||
done
|
||||
terminate_children() {
|
||||
echo "Termination signal received, forwarding to subprocesses..."
|
||||
|
||||
# Start services.d
|
||||
if "$HAS_PGREP"; then
|
||||
# Use pgrep for efficient child process discovery
|
||||
local child_pids
|
||||
child_pids=$(pgrep -P "$$" 2>/dev/null || true)
|
||||
if [ -n "$child_pids" ]; then
|
||||
echo "$child_pids" | while read -r pid; do
|
||||
echo "Terminating child PID $pid"
|
||||
kill -TERM "$pid" 2>/dev/null || echo "Failed to terminate PID $pid"
|
||||
done
|
||||
fi
|
||||
elif command -v ps > /dev/null 2>&1; then
|
||||
# Fallback to ps
|
||||
local child_pids
|
||||
child_pids=$(ps -o pid --ppid="$$" --no-headers 2>/dev/null | tr -d ' ' || true)
|
||||
if [ -n "$child_pids" ]; then
|
||||
echo "$child_pids" | while read -r pid; do
|
||||
[ -n "$pid" ] || continue
|
||||
echo "Terminating child PID $pid"
|
||||
kill -TERM "$pid" 2>/dev/null || echo "Failed to terminate PID $pid"
|
||||
done
|
||||
fi
|
||||
else
|
||||
# Last resort: proc filesystem parsing (optimized)
|
||||
for pid_dir in /proc/[0-9]*; do
|
||||
[ -d "$pid_dir" ] || continue
|
||||
local pid="${pid_dir#/proc/}"
|
||||
|
||||
# Skip self and init
|
||||
[ "$pid" != "$$" ] && [ "$pid" != "1" ] || continue
|
||||
|
||||
# Check if it's our child (more efficient check)
|
||||
if [ -r "$pid_dir/stat" ]; then
|
||||
local ppid
|
||||
ppid=$(awk '{print $4}' "$pid_dir/stat" 2>/dev/null || true)
|
||||
if [ "$ppid" = "$$" ]; then
|
||||
echo "Terminating child PID $pid"
|
||||
kill -TERM "$pid" 2>/dev/null || echo "Failed to terminate PID $pid"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
sleep 5
|
||||
kill -KILL -$$ 2>/dev/null || true
|
||||
wait
|
||||
echo "All subprocesses terminated. Exiting."
|
||||
exit 0
|
||||
}
|
||||
|
||||
####################
|
||||
# Starting scripts #
|
||||
####################
|
||||
|
||||
# Process initialization scripts
|
||||
if [ -d /etc/cont-init.d ]; then
|
||||
for script_file in /etc/cont-init.d/*; do
|
||||
[ -e "$script_file" ] || continue
|
||||
run_script "$script_file" script
|
||||
done
|
||||
fi
|
||||
|
||||
# Start services if we're PID 1
|
||||
if [ -d /etc/services.d ]; then
|
||||
if "$PID1"; then
|
||||
for service_dir in /etc/services.d/*; do
|
||||
SCRIPTS="${service_dir}/run"
|
||||
[ -e "$SCRIPTS" ] || continue
|
||||
run_script "$SCRIPTS" service
|
||||
[ -d "$service_dir" ] || continue
|
||||
local service_script="${service_dir}/run"
|
||||
[ -e "$service_script" ] || continue
|
||||
run_script "$service_script" service
|
||||
done
|
||||
else
|
||||
echo "Not PID 1 — skipping service startup"
|
||||
@@ -108,37 +244,13 @@ if "$PID1"; then
|
||||
echo
|
||||
echo -e "\033[0;32mEverything started!\033[0m"
|
||||
|
||||
terminate() {
|
||||
echo "Termination signal received, forwarding to subprocesses..."
|
||||
|
||||
if command -v pgrep &> /dev/null; then
|
||||
for pid in $(pgrep -P "$$"); do
|
||||
echo "Terminating child PID $pid"
|
||||
kill -TERM "$pid" 2> /dev/null || echo "Failed to terminate PID $pid"
|
||||
done
|
||||
else
|
||||
for pid in /proc/[0-9]*/; do
|
||||
pid=${pid#/proc/}
|
||||
pid=${pid%/}
|
||||
if [[ "$pid" -ne 1 ]] && grep -q "^PPid:\s*$$" "/proc/$pid/status" 2> /dev/null; then
|
||||
echo "Terminating child PID $pid"
|
||||
kill -TERM "$pid" 2> /dev/null || echo "Failed to terminate PID $pid"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
sleep 5
|
||||
kill -KILL -$$ 2> /dev/null || true
|
||||
wait
|
||||
echo "All subprocesses terminated. Exiting."
|
||||
exit 0
|
||||
}
|
||||
|
||||
trap terminate SIGTERM SIGINT
|
||||
trap terminate_children SIGTERM SIGINT
|
||||
wait -n
|
||||
else
|
||||
echo
|
||||
echo -e "\033[0;32mStarting the upstream container\033[0m"
|
||||
echo
|
||||
if [ -f /docker-mods ]; then exec /docker-mods; fi
|
||||
if [ -f /docker-mods ]; then
|
||||
exec /docker-mods
|
||||
fi
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user