avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-01-10 09:51:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update ha_entrypoint.sh

Browse Source
This commit is contained in:
Alexandre
2025-07-28 22:32:55 +02:00
committed by GitHub
parent 41cb49a502
commit 3f7c23542a
1 changed files with 115 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
.templates/ha_entrypoint.sh
View File

@@ -18,22 +18,12 @@ 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)
# Pre-build available interpreters list
# Available interpreters array (populated by function)
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 #
@@ -50,32 +40,87 @@ log_warning() {
log_error() {
local message="$1"
echo -e "\033[0;31mError\033[0m : $message"
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 current shebang
# 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 interpreter exists
if [ -f "${currentshebang%% *}" ]; then
# Check if current interpreter exists and is executable
if [ -x "$interpreter_path" ]; then
return 0
fi
# Find first available interpreter
for shebang in "${AVAILABLE_INTERPRETERS[@]}"; do
echo "Valid shebang: $shebang"
sed -i "1s|.*|#!$shebang|" "$runfile"
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
done
fi
log_warning "No valid interpreter found for $runfile"
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=()
@@ -83,28 +128,28 @@ apply_script_modifications() {
# 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 /'
'-E' '-e' 's/^([[:space:]]*)chown /\1true # chown /'
'-E' '-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'
'-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' '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'
'-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 -E "${sed_commands[@]}" "$runfile"
sed -i "${sed_commands[@]}" "$runfile"
fi
}
@@ -115,7 +160,9 @@ set_permissions() {
chown "$(id -u)":"$(id -g)" "$runfile"
chmod a+x "$runfile"
else
log_warning "Script executed as UID $(id -u), chown/chmod may fail"
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
}
@@ -130,7 +177,16 @@ run_script() {
echo "$runfile: executing"
# Fix shebang if needed
fix_shebang "$runfile"
if ! fix_shebang "$runfile"; then
log_error "$runfile: Cannot fix shebang, skipping"
return 1
fi
# Validate script syntax
if ! validate_script_syntax "$runfile"; then
log_error "$runfile: Syntax validation failed, skipping"
return 1
fi
# Set permissions
set_permissions "$runfile"
@@ -145,7 +201,15 @@ run_script() {
;;
script)
if [ "${ha_entry_source:-null}" = true ]; then
source "$runfile" || log_error "$runfile exiting $?"
# Additional safety check before sourcing
if validate_script_syntax "$runfile"; then
if source "$runfile" || log_error "$runfile exiting $?"; then
rm "$runfile"
fi
else
log_error "$runfile: Failed syntax check before sourcing"
return 1
fi
else
"$runfile" || log_error "$runfile exiting $?"
fi
@@ -166,17 +230,18 @@ terminate_children() {
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 "$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 command -v ps > /dev/null 2>&1; then
elif "$HAS_PS"; then
# Fallback to ps
local child_pids
child_pids=$(ps -o pid --ppid="$$" --no-headers 2>/dev/null | tr -d ' ' || true)
child_pids=$(ps -o pid= --ppid="$$" 2>/dev/null | tr -d ' ' || true)
if [ -n "$child_pids" ]; then
echo "$child_pids" | while read -r pid; do
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"
@@ -191,7 +256,7 @@ terminate_children() {
# Skip self and init
[ "$pid" != "$$" ] && [ "$pid" != "1" ] || continue
# Check if it's our child (more efficient check)
# 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)
@@ -203,13 +268,26 @@ terminate_children() {
done
fi
# Wait for graceful termination
sleep 5
kill -KILL -$$ 2>/dev/null || true
# 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 #
####################