mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-06-06 23:55:56 +02:00
Revert code
This commit is contained in:
Alexandre
@@ -7,7 +7,7 @@ set -Eeuo pipefail
|
|||||||
echo "Starting..."
|
echo "Starting..."
|
||||||
|
|
||||||
####################
|
####################
|
||||||
# Global Variables #
|
# Starting scripts #
|
||||||
####################
|
####################
|
||||||
|
|
||||||
PID1=false
|
PID1=false
|
||||||
@@ -15,299 +15,85 @@ if [ "$$" -eq 1 ]; then
|
|||||||
PID1=true
|
PID1=true
|
||||||
fi
|
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 HAS_PS=$(command -v ps > /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)
|
|
||||||
|
|
||||||
# Available interpreters array (populated by function)
|
|
||||||
AVAILABLE_INTERPRETERS=()
|
|
||||||
|
|
||||||
####################
|
|
||||||
# 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" >&2
|
|
||||||
}
|
|
||||||
|
|
||||||
build_available_interpreters() {
|
|
||||||
AVAILABLE_INTERPRETERS=()
|
|
||||||
local shebang_list="/usr/bin/bashio /usr/bin/bash /usr/bin/sh /bin/bash /bin/sh"
|
|
||||||
local shebang command_path
|
|
||||||
|
|
||||||
if ! "$PID1"; then
|
|
||||||
shebang_list="/usr/bin/with-contenv bashio /command/with-contenv bashio $shebang_list"
|
|
||||||
fi
|
|
||||||
|
|
||||||
for shebang in $shebang_list; do
|
|
||||||
command_path="${shebang%% *}"
|
|
||||||
if [ -x "$command_path" ] && "$command_path" echo "yes" > /dev/null 2>&1; then
|
|
||||||
AVAILABLE_INTERPRETERS+=("$shebang")
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
is_valid_shebang_line() {
|
|
||||||
local line="$1"
|
|
||||||
# Check if line starts with #! and has content after it
|
|
||||||
[[ "$line" =~ ^#![[:space:]]*[^[:space:]]+ ]]
|
|
||||||
}
|
|
||||||
|
|
||||||
fix_shebang() {
|
|
||||||
local runfile="$1"
|
|
||||||
|
|
||||||
# Get first line to check if it's a shebang
|
|
||||||
local first_line
|
|
||||||
first_line="$(sed -n '1p' "$runfile")"
|
|
||||||
|
|
||||||
# If it's not a shebang line, don't modify
|
|
||||||
if ! is_valid_shebang_line "$first_line"; then
|
|
||||||
log_warning "$runfile: No valid shebang found, skipping shebang fix"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Extract current interpreter path
|
|
||||||
local currentshebang
|
|
||||||
currentshebang="$(sed -n '1{s/^#![[:blank:]]*//p;q}' "$runfile")"
|
|
||||||
local interpreter_path="${currentshebang%% *}"
|
|
||||||
|
|
||||||
# Check if current interpreter exists and is executable
|
|
||||||
if [ -x "$interpreter_path" ]; then
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Find first available interpreter
|
|
||||||
if [ ${#AVAILABLE_INTERPRETERS[@]} -gt 0 ]; then
|
|
||||||
local new_shebang="${AVAILABLE_INTERPRETERS[0]}"
|
|
||||||
echo "Fixing shebang in $runfile: $new_shebang"
|
|
||||||
sed -i "1s|^#!.*|#!$new_shebang|" "$runfile"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
log_error "No valid interpreter found for $runfile"
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
validate_script_syntax() {
|
|
||||||
local runfile="$1"
|
|
||||||
|
|
||||||
# Extract shebang to determine interpreter
|
|
||||||
local shebang
|
|
||||||
shebang="$(sed -n '1{s/^#![[:blank:]]*//p;q}' "$runfile")"
|
|
||||||
local interpreter="${shebang%% *}"
|
|
||||||
|
|
||||||
# Only validate bash/sh scripts
|
|
||||||
case "$interpreter" in
|
|
||||||
*/bash|*/sh|bash|sh)
|
|
||||||
if ! "$interpreter" -n "$runfile" 2>/dev/null; then
|
|
||||||
log_error "$runfile: Syntax validation failed"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
apply_script_modifications() {
|
|
||||||
local runfile="$1"
|
|
||||||
local sed_commands=()
|
|
||||||
|
|
||||||
# Build sed command array based on conditions
|
|
||||||
if ! "$IS_ROOT"; then
|
|
||||||
sed_commands+=(
|
|
||||||
'-E' '-e' 's/^([[:space:]]*)chown /\1true # chown /'
|
|
||||||
'-E' '-e' 's/^([[:space:]]*)chmod /\1true # chmod /'
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! "$HAS_S6_SETUIDGID"; then
|
|
||||||
sed_commands+=(
|
|
||||||
'-E' '-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' '-e' 's/(^|[[:space:]])exit ([0-9]+)/\1return \2 || exit \2/g'
|
|
||||||
'-E' '-e' 's/bashio::exit\.nok/return 1/g'
|
|
||||||
'-E' '-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 "${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 for $runfile"
|
|
||||||
# Try to make executable anyway
|
|
||||||
chmod +x "$runfile" 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
####################
|
|
||||||
# Main Functions #
|
|
||||||
####################
|
|
||||||
|
|
||||||
run_script() {
|
run_script() {
|
||||||
local runfile="$1"
|
local runfile="$1"
|
||||||
local script_kind="$2"
|
local script_kind="$2"
|
||||||
|
|
||||||
echo "$runfile: executing"
|
echo "$runfile: executing"
|
||||||
|
|
||||||
# Fix shebang if needed
|
# FIX: Correct current shebang parsing
|
||||||
if ! fix_shebang "$runfile"; then
|
local currentshebang
|
||||||
log_error "$runfile: Cannot fix shebang, skipping"
|
currentshebang="$(sed -n '1{s/^#![[:blank:]]*//p;q}' "$runfile")"
|
||||||
return 1
|
|
||||||
|
# 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
|
fi
|
||||||
|
|
||||||
# Validate script syntax
|
# Check if run as root
|
||||||
if ! validate_script_syntax "$runfile"; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
log_error "$runfile: Syntax validation failed, skipping"
|
chown "$(id -u)":"$(id -g)" "$runfile"
|
||||||
return 1
|
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
|
fi
|
||||||
|
|
||||||
# Set permissions
|
|
||||||
set_permissions "$runfile"
|
|
||||||
|
|
||||||
# Apply script modifications
|
|
||||||
apply_script_modifications "$runfile"
|
|
||||||
|
|
||||||
# Execute script
|
# Execute script
|
||||||
case "$script_kind" in
|
if [[ "$script_kind" == service ]]; then
|
||||||
service)
|
"$runfile" &
|
||||||
"$runfile" &
|
else
|
||||||
;;
|
if [ "${ha_entry_source:-null}" = true ]; then
|
||||||
script)
|
sed -Ei 's/(^|[[:space:]])exit ([0-9]+)/\1return \2 || exit \2/g' "$runfile"
|
||||||
if [ "${ha_entry_source:-null}" = true ]; then
|
sed -i "s/bashio::exit.nok/return 1/g" "$runfile"
|
||||||
# Additional safety check before sourcing
|
sed -i "s/bashio::exit.ok/return 0/g" "$runfile"
|
||||||
if validate_script_syntax "$runfile"; then
|
source "$runfile" || echo -e "\033[0;31mError\033[0m : $runfile exiting $?"
|
||||||
if source "$runfile" || log_error "$runfile exiting $?"; then
|
else
|
||||||
rm "$runfile"
|
"$runfile" || echo -e "\033[0;31mError\033[0m : $runfile exiting $?"
|
||||||
fi
|
fi
|
||||||
else
|
fi
|
||||||
log_error "$runfile: Failed syntax check before sourcing"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
"$runfile" || log_error "$runfile exiting $?"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Cleanup temporary scripts
|
# Cleanup only temporary scripts
|
||||||
if [[ "$script_kind" != service && "$runfile" == /tmp/* ]]; then
|
if [[ "$script_kind" != service && "$runfile" == /tmp/* ]]; then
|
||||||
rm -f "$runfile"
|
rm -f "$runfile"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
terminate_children() {
|
# Loop through /etc/cont-init.d/*
|
||||||
echo "Termination signal received, forwarding to subprocesses..."
|
for SCRIPTS in /etc/cont-init.d/*; do
|
||||||
|
[ -e "$SCRIPTS" ] || continue
|
||||||
|
run_script "$SCRIPTS" script
|
||||||
|
done
|
||||||
|
|
||||||
if "$HAS_PGREP"; then
|
# Start services.d
|
||||||
# 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 IFS= 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
|
|
||||||
elif "$HAS_PS"; then
|
|
||||||
# Fallback to ps
|
|
||||||
local child_pids
|
|
||||||
child_pids=$(ps -o pid= --ppid="$$" 2>/dev/null | tr -d ' ' || true)
|
|
||||||
if [ -n "$child_pids" ]; then
|
|
||||||
echo "$child_pids" | while IFS= 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 using stat file (more efficient)
|
|
||||||
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
|
|
||||||
|
|
||||||
# Wait for graceful termination
|
|
||||||
sleep 5
|
|
||||||
|
|
||||||
# WARNING: This kills the entire process group - only safe in PID1 context
|
|
||||||
if "$PID1"; then
|
|
||||||
kill -KILL -$$ 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
|
|
||||||
wait
|
|
||||||
echo "All subprocesses terminated. Exiting."
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
####################
|
|
||||||
# Initialization #
|
|
||||||
####################
|
|
||||||
|
|
||||||
# Build available interpreters list
|
|
||||||
build_available_interpreters
|
|
||||||
|
|
||||||
####################
|
|
||||||
# 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 [ -d /etc/services.d ]; then
|
||||||
if "$PID1"; then
|
if "$PID1"; then
|
||||||
for service_dir in /etc/services.d/*; do
|
for service_dir in /etc/services.d/*; do
|
||||||
[ -d "$service_dir" ] || continue
|
SCRIPTS="${service_dir}/run"
|
||||||
local service_script="${service_dir}/run"
|
[ -e "$SCRIPTS" ] || continue
|
||||||
[ -e "$service_script" ] || continue
|
run_script "$SCRIPTS" service
|
||||||
run_script "$service_script" service
|
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
echo "Not PID 1 — skipping service startup"
|
echo "Not PID 1 — skipping service startup"
|
||||||
@@ -322,13 +108,37 @@ if "$PID1"; then
|
|||||||
echo
|
echo
|
||||||
echo -e "\033[0;32mEverything started!\033[0m"
|
echo -e "\033[0;32mEverything started!\033[0m"
|
||||||
|
|
||||||
trap terminate_children SIGTERM SIGINT
|
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
|
||||||
wait -n
|
wait -n
|
||||||
else
|
else
|
||||||
echo
|
echo
|
||||||
echo -e "\033[0;32mStarting the upstream container\033[0m"
|
echo -e "\033[0;32mStarting the upstream container\033[0m"
|
||||||
echo
|
echo
|
||||||
if [ -f /docker-mods ]; then
|
if [ -f /docker-mods ]; then exec /docker-mods; fi
|
||||||
exec /docker-mods
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user