🗃️ Updated 🗃️

Dockerfile .env.scripts .gitattributes .gitea/workflows/build.yml .gitignore README.md rootfs/root/docker/setup/00-init.sh rootfs/root/docker/setup/01-system.sh rootfs/root/docker/setup/02-packages.sh rootfs/root/docker/setup/03-files.sh rootfs/root/docker/setup/04-users.sh rootfs/root/docker/setup/05-custom.sh rootfs/root/docker/setup/06-post.sh rootfs/root/docker/setup/07-cleanup.sh rootfs/tmp/etc/opengist/config.yaml rootfs/usr/local/bin/entrypoint.sh rootfs/usr/local/etc/docker/functions/entrypoint.sh rootfs/usr/local/etc/docker/init.d/00-opengist.sh rootfs/usr/local/etc/resolv.conf
2026-06-24 02:01:02 -04:00 · 2026-06-12 05:39:45 -04:00
parent 00be90c1a0
commit bc212ec85c
19 changed files with 1112 additions and 736 deletions
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290807-git
+##@Version           :  202606051249-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  jason@casjaysdev.pro
 # @@License          :  LICENSE.md
 # @@ReadME           :  00-opengist.sh --help
-# @@Copyright        :  Copyright: (c) 2025 Jason Hempstead, Casjays Developments
-# @@Created          :  Saturday, Nov 29, 2025 08:07 EST
+# @@Copyright        :  Copyright: (c) 2026 Jason Hempstead, Casjays Developments
+# @@Created          :  Friday, Jun 12, 2026 05:22 EDT
 # @@File             :  00-opengist.sh
 # @@Description      :
 # @@Changelog        :  New script
@@ -20,11 +20,34 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-set -e
+set -eo pipefail
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # run trap command on exit
-trap 'retVal=$?; echo "❌ Fatal error occurred: Exit code $retVal at line $LINENO in command: $BASH_COMMAND"; kill -TERM 1' ERR
-trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGINT SIGTERM SIGPWR
+trap '__trap_err_handler' ERR
+trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGINT SIGTERM
+trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGPWR 2>/dev/null || true
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# ERR trap handler - smart about critical vs non-critical errors
+__trap_err_handler() {
+	local retVal=$?
+	local command="$BASH_COMMAND"
+	# Ignore SIGPIPE and user interrupts
+	[ $retVal -eq 130 ] || [ $retVal -eq 141 ] && return $retVal
+	# Non-critical: file operations, text processing, user/group operations
+	if [[ "$command" =~ (mkdir|touch|chmod|chown|chgrp|ln|cp|mv|rm|echo|printf|cat|tee|sed|awk|grep|find|sort|uniq|adduser|addgroup|usermod|groupmod|id|getent) ]]; then
+		return 0
+	fi
+	# Non-critical: conditional checks that might fail
+	if [[ "$command" =~ (test|\[|\[\[|kill -0|pgrep|pidof|ps) ]]; then
+		return 0
+	fi
+	# Critical error - but only fail if service hasn't started yet
+	if [ "$SERVICE_IS_RUNNING" != "yes" ]; then
+		echo "❌ Critical error (exit $retVal): $command" >&2
+		kill -TERM 1 2>/dev/null || exit $retVal
+	fi
+	return 0
+}
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 SCRIPT_FILE="$0"
 SERVICE_NAME="opengist"
@@ -43,11 +66,20 @@ __script_exit() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Exit if service is disabled
-[ -z "$OPENGIST_APPNAME_ENABLED" ] || if [ "$OPENGIST_APPNAME_ENABLED" != "yes" ]; then export SERVICE_DISABLED="$SERVICE_NAME" && __script_exit 0; fi
+if [ -n "$OPENGIST_APPNAME_ENABLED" ]; then
+	if [ "$OPENGIST_APPNAME_ENABLED" != "yes" ]; then
+		export SERVICE_DISABLED="$SERVICE_NAME"
+		__script_exit 0
+	fi
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
 [ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}"
-{ [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && echo "Enabling debugging" && set -xo pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail
+if [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; then
+	echo "Enabling debugging"
+	[ -n "$DEBUGGER_OPTIONS" ] && set -"$DEBUGGER_OPTIONS"
+	export DEBUGGER="on"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -58,7 +90,9 @@ fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # import variables
 for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do
-	[ -f "$set_env" ] && . "$set_env"
+	if [ -f "$set_env" ]; then
+		. "$set_env"
+	fi
 done
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # exit if __start_init_scripts function hasn't been Initialized
@@ -69,7 +103,7 @@ if [ ! -f "/run/.start_init_scripts.pid" ]; then
 fi
 # Clean up any stale PID file for this service on startup
 if [ -n "$SERVICE_NAME" ] && [ -f "/run/init.d/$SERVICE_NAME.pid" ]; then
-	old_pid=$(cat "/run/init.d/$SERVICE_NAME.pid" 2>/dev/null)
+	old_pid=$(<"/run/init.d/$SERVICE_NAME.pid") 2>/dev/null
 	if [ -n "$old_pid" ] && ! kill -0 "$old_pid" 2>/dev/null; then
 		echo "🧹 Removing stale PID file for $SERVICE_NAME"
 		rm -f "/run/init.d/$SERVICE_NAME.pid"
@@ -108,7 +142,7 @@ RUN_DIR="/run/opengist"
 LOG_DIR="/data/logs/opengist"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the working dir
-WORK_DIR=""
+WORK_DIR="$DATA_DIR"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # port which service is listening on
 SERVICE_PORT="80"
@@ -140,7 +174,7 @@ EXEC_CMD_BIN='opengist'
 EXEC_CMD_ARGS='--config $ETC_DIR/config.yaml start'
 # execute script before
 EXEC_PRE_SCRIPT=''
-# Set to no if the service is not running otherwise leave blank
+# Set to 'no' for configuration services (no daemon process), leave blank for actual services
 SERVICE_USES_PID=''
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Is this service a web server
@@ -164,10 +198,6 @@ POST_EXECUTE_WAIT_TIME="1"
 # Update path var
 PATH="$PATH:."
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-# Lets get containers ip address
-IP4_ADDRESS="$(__get_ip4)"
-IP6_ADDRESS="$(__get_ip6)"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Where to save passwords to
 # directory to save username/password for root user
 ROOT_FILE_PREFIX="/config/secure/auth/root"
@@ -188,12 +218,16 @@ user_pass="${OPENGIST_USER_PASS_WORD:-}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Load variables from config
 # Generated by my dockermgr script
-[ -f "/config/env/opengist.script.sh" ] && . "/config/env/opengist.script.sh"
-# Overwrite the variabes
-[ -f "/config/env/opengist.sh" ] && . "/config/env/opengist.sh"
+if [ -f "/config/env/opengist.script.sh" ]; then
+	. "/config/env/opengist.script.sh"
+fi
+# Overwrite the variables
+if [ -f "/config/env/opengist.sh" ]; then
+	. "/config/env/opengist.sh"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Additional predefined variables
-DATABASE_DIR="/data/db/sqlite"
+
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Additional variables

@@ -221,11 +255,15 @@ CMD_ENV=""
 __run_precopy() {
 	# Define environment
 	local hostname=${HOSTNAME}
-	[ -d "/run/healthcheck" ] || mkdir -p "/run/healthcheck"
+	if [ ! -d "/run/healthcheck" ]; then
+		mkdir -p "/run/healthcheck"
+	fi
 	# Define actions/commands

 	# allow custom functions
-	if builtin type -t __run_precopy_local | grep -q 'function'; then __run_precopy_local; fi
+	if builtin type -t __run_precopy_local | grep -q 'function'; then
+		__run_precopy_local
+	fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Custom prerun functions - IE setup WWW_ROOT_DIR
@@ -235,7 +273,9 @@ __execute_prerun() {
 	# Define actions/commands

 	# allow custom functions
-	if builtin type -t __execute_prerun_local | grep -q 'function'; then __execute_prerun_local; fi
+	if builtin type -t __execute_prerun_local | grep -q 'function'; then
+		__execute_prerun_local
+	fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Run any pre-execution checks
@@ -257,11 +297,15 @@ __run_pre_execute_checks() {
 	# show exit message
 	if [ $exitStatus -ne 0 ]; then
 		echo "The pre-execution check has failed" >&2
-		[ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE"
+		if [ -f "$SERVICE_PID_FILE" ]; then
+			rm -Rf "$SERVICE_PID_FILE"
+		fi
 		__script_exit 1
 	fi
 	# allow custom functions
-	if builtin type -t __run_pre_execute_checks_local | grep -q 'function'; then __run_pre_execute_checks_local; fi
+	if builtin type -t __run_pre_execute_checks_local | grep -q 'function'; then
+		__run_pre_execute_checks_local
+	fi
 	# exit function
 	return $exitStatus
 }
@@ -281,15 +325,19 @@ __update_conf_files() {

 	# - - - - - - - - - - - - - - - - - - - - - - - - -
 	# replace variables
-	# __replace "" "" "$CONF_DIR/opengist.conf"
+	__replace "REPLACE_HOSTNAME" "$sysname" "$ETC_DIR/opengist.yaml"
+	__replace "REPLACE_DATA_DIR" "$DATA_DIR" "$ETC_DIR/opengist.yaml"
+	__replace "REPLACE_SERVER_PORT" "$SERVICE_PORT" "$ETC_DIR/opengist.yaml"
 	# replace variables recursively
-	__initialize_replace_variables "$ETC_DIR" "$CONF_DIR"
+	# __find_replace "" "" "$CONF_DIR"

 	# - - - - - - - - - - - - - - - - - - - - - - - - -
 	# define actions
-  [ "$DATABASE_DIR" ] && chown -Rf $SERVICE_USER:$SERVICE_GROUP "$DATABASE_DIR"
+
 	# allow custom functions
-	if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi
+	if builtin type -t __update_conf_files_local | grep -q 'function'; then
+		__update_conf_files_local
+	fi
 	# exit function
 	return $exitCode
 }
@@ -311,7 +359,9 @@ __pre_execute() {
 	# Lets wait a few seconds before continuing
 	sleep 2
 	# allow custom functions
-	if builtin type -t __pre_execute_local | grep -q 'function'; then __pre_execute_local; fi
+	if builtin type -t __pre_execute_local | grep -q 'function'; then
+		__pre_execute_local
+	fi
 	# exit function
 	return $exitCode
 }
@@ -341,10 +391,12 @@ __post_execute() {
 		# show exit message
 		__banner "$postMessageEnd: Status $retVal"
 	) 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
-	pid=$!
-	ps ax | awk '{print $1}' | grep -v grep | grep -q "$execPid$" && retVal=0 || retVal=10
+	# fire-and-forget: backgrounded subshell always succeeds at launch
+	retVal=0
 	# allow custom functions
-	if builtin type -t __post_execute_local | grep -q 'function'; then __post_execute_local; fi
+	if builtin type -t __post_execute_local | grep -q 'function'; then
+		__post_execute_local
+	fi
 	# exit function
 	return $retVal
 }
@@ -352,11 +404,15 @@ __post_execute() {
 # use this function to update config files - IE: change port
 __pre_message() {
 	local exitCode=0
-	[ -n "$PRE_EXEC_MESSAGE" ] && eval echo "$PRE_EXEC_MESSAGE"
+	if [ -n "$PRE_EXEC_MESSAGE" ]; then
+		eval echo "$PRE_EXEC_MESSAGE"
+	fi
 	# execute commands

 	# allow custom functions
-	if builtin type -t __pre_message_local | grep -q 'function'; then __pre_message_local; fi
+	if builtin type -t __pre_message_local | grep -q 'function'; then
+		__pre_message_local
+	fi
 	# exit function
 	return $exitCode
 }
@@ -364,12 +420,13 @@ __pre_message() {
 # use this function to setup ssl support
 __update_ssl_conf() {
 	local exitCode=0
-	# set hostname
 	local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
 	# execute commands

 	# allow custom functions
-	if builtin type -t __update_ssl_conf_local | grep -q 'function'; then __update_ssl_conf_local; fi
+	if builtin type -t __update_ssl_conf_local | grep -q 'function'; then
+		__update_ssl_conf_local
+	fi
 	# set exitCode
 	return $exitCode
 }
@@ -412,8 +469,12 @@ EOF
 		__update_ssl_conf_local() { true; }
 		# - - - - - - - - - - - - - - - - - - - - - - - - -
 	fi
-	__file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" || exitCode=$((exitCode + 1))
-	__file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" || exitCode=$((exitCode + 1))
+	if ! __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"; then
+		exitCode=$((exitCode + 1))
+	fi
+	if ! __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh"; then
+		exitCode=$((exitCode + 1))
+	fi
 	return $exitCode
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -440,99 +501,146 @@ __run_start_script() {
 	local path="$(eval echo "$PATH")"
 	# expand variables
 	local message="$(eval echo "")"
-	# set hostname
 	local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
-	[ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ] && . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
+	if [ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ]; then
+		. "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
+	fi
 	#
 	if [ -z "$cmd" ]; then
 		__post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
 		retVal=$?
-		echo "Initializing $SCRIPT_NAME has completed"
+		__log_info "Initialization of $SCRIPT_NAME has completed"
 		__script_exit $retVal
 	else
 		# ensure the command exists
 		if [ ! -x "$cmd" ]; then
-			echo "$name is not a valid executable"
+			__log_error "$name is not a valid executable"
 			return 2
 		fi
-		# check and exit if already running
+		# check and exit if already running (respects SERVICE_USES_PID in __proc_check)
 		if __proc_check "$name" || __proc_check "$cmd"; then
+			__log_debug "Service $name is already running"
 			return 0
 		else
 			# - - - - - - - - - - - - - - - - - - - - - - - - -
 			# show message if env exists
 			if [ -n "$cmd" ]; then
-				[ -n "$SERVICE_USER" ] && echo "Setting up $cmd to run as $SERVICE_USER" || SERVICE_USER="root"
-				[ -n "$SERVICE_PORT" ] && echo "$name will be running on port $SERVICE_PORT" || SERVICE_PORT=""
+				if [ -n "$SERVICE_USER" ]; then
+					__log_info "Setting up $cmd to run as $SERVICE_USER"
+				else
+					SERVICE_USER="root"
+				fi
+				if [ -n "$SERVICE_PORT" ]; then
+					__log_info "$name will be running on port $SERVICE_PORT"
+				else
+					SERVICE_PORT=""
+				fi
 			fi
-			if [ -n "$pre" ] && [ -n "$(command -v "$pre" 2>/dev/null)" ]; then
+			if [ -n "$pre" ] && command -v "$pre" &>/dev/null; then
 				export cmd_exec="$pre $cmd $args"
 				message="Starting service: $name $args through $pre"
 			else
 				export cmd_exec="$cmd $args"
 				message="Starting service: $name $args"
 			fi
-			[ -n "$su_exec" ] && echo "using $su_exec" | tee -a -p "/data/logs/init.txt"
-			echo "$message" | tee -a -p "/data/logs/init.txt"
+			if [ -n "$su_exec" ]; then
+				__log_debug "Using $su_exec" | tee -a -p "/data/logs/init.txt"
+			fi
+			__log_info "$message" | tee -a -p "/data/logs/init.txt"
 			su_cmd touch "$SERVICE_PID_FILE"
+			# W14: invalidate cached START_SCRIPT if key variables changed
+			local _script_hash_src="$cmd $args $SERVICE_USER $RESET_ENV $su_exec"
+			local _script_hash
+			_script_hash=$(printf '%s' "$_script_hash_src" | md5sum 2>/dev/null | cut -c1-8 || true)
+			if [ -f "${START_SCRIPT}.hash" ] && [ -f "$START_SCRIPT" ]; then
+				if [ "$(<"${START_SCRIPT}.hash")" != "$_script_hash" ]; then
+					rm -f "$START_SCRIPT" "${START_SCRIPT}.hash"
+				fi
+			fi
 			if [ "$RESET_ENV" = "yes" ]; then
-				env_command="$(echo "env -i HOME=\"$home\" LC_CTYPE=\"$lc_type\" PATH=\"$path\" HOSTNAME=\"$sysname\" USER=\"${SERVICE_USER:-$RUNAS_USER}\" $extra_env")"
-				execute_command="$(__trim "$su_exec $env_command $cmd_exec")"
+				# RESET_ENV=yes intentionally strips all inherited vars; only explicit vars are passed
 				if [ ! -f "$START_SCRIPT" ]; then
-					cat <<EOF >"$START_SCRIPT"
-#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
-#
-set -Eeo pipefail
-# Setting up $cmd to run as ${SERVICE_USER:-root} with env
-retVal=10
-cmd="$cmd"
-args="$args"
-SERVICE_NAME="$SERVICE_NAME"
-SERVICE_PID_FILE="$SERVICE_PID_FILE"
-LOG_DIR="$LOG_DIR"
-execute_command="$execute_command"
-\$execute_command 2>"/dev/stderr" >>"\$LOG_DIR/\$SERVICE_NAME.log" &
-execPid=\$!
-sleep 1
-checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || false)"
-[ -n "\$execPid"  ] && [ -n "\$checkPID" ] && echo "\$execPid" >"\$SERVICE_PID_FILE" && retVal=0 || retVal=10
-[ "\$retVal" = 0 ] && printf '%s\n' "\$SERVICE_NAME: \$execPid" >"/run/healthcheck/\$SERVICE_NAME" || echo "Failed to start $execute_command" >&2
-exit \$retVal
-
-EOF
+					# Use printf %q to safely quote each env component for embedding in the script
+					local _q_home _q_lc _q_path _q_sysname _q_svcuser _q_su _q_cmd _q_args _q_extra
+					_q_home=$(printf '%q' "$home")
+					_q_lc=$(printf '%q' "$lc_type")
+					_q_path=$(printf '%q' "$path")
+					_q_sysname=$(printf '%q' "$sysname")
+					_q_svcuser=$(printf '%q' "${SERVICE_USER:-$RUNAS_USER}")
+					_q_su=''
+					[ -n "$su_exec" ] && _q_su=$(printf '%q ' $su_exec)
+					_q_cmd=$(printf '%q' "$cmd")
+					_q_args=''
+					[ -n "$args" ] && _q_args=$(printf '%q ' $args)
+					_q_extra=''
+					[ -n "$extra_env" ] && _q_extra=$(printf '%q ' $extra_env)
+					{
+						printf '#!/usr/bin/env bash\n'
+						printf "trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f \"\$SERVICE_PID_FILE\" ] && rm -Rf \"\$SERVICE_PID_FILE\";exit \$exitCode' EXIT\n"
+						printf 'set -Eeo pipefail\n'
+						printf '# Setting up %s to run as %s with env\n' "$cmd" "${SERVICE_USER:-root}"
+						printf 'retVal=10\n'
+						printf 'SERVICE_NAME=%q\n' "$SERVICE_NAME"
+						printf 'SERVICE_PID_FILE=%q\n' "$SERVICE_PID_FILE"
+						printf 'LOG_DIR=%q\n' "$LOG_DIR"
+						printf '%s env -i HOME=%s LC_CTYPE=%s PATH=%s HOSTNAME=%s USER=%s %s %s %s 2>>"/dev/stderr" >>"$LOG_DIR/$SERVICE_NAME.log" &\n' \
+							"$_q_su" "$_q_home" "$_q_lc" "$_q_path" "$_q_sysname" "$_q_svcuser" "$_q_extra" "$_q_cmd" "$_q_args"
+						printf 'execPid=$!\n'
+						printf 'sleep 1\n'
+						printf 'if [ -n "$execPid" ] && kill -0 "$execPid" 2>/dev/null; then\n'
+						printf '  echo "$execPid" >"$SERVICE_PID_FILE"\n'
+						printf '  retVal=0\n'
+						printf '  printf '"'"'%%s\n'"'"' "$SERVICE_NAME: $execPid" >"/run/healthcheck/$SERVICE_NAME"\n'
+						printf 'else\n'
+						printf '  retVal=10\n'
+						printf '  echo "Failed to start service %s" >&2\n' "$cmd"
+						printf 'fi\n'
+						printf 'exit $retVal\n'
+					} >"$START_SCRIPT"
+					printf '%s' "$_script_hash" >"${START_SCRIPT}.hash"
 				fi
 			else
 				if [ ! -f "$START_SCRIPT" ]; then
-					execute_command="$(__trim "$su_exec $cmd_exec")"
-					cat <<EOF >"$START_SCRIPT"
-#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
-#
-set -Eeo pipefail
-# Setting up $cmd to run as ${SERVICE_USER:-root}
-retVal=10
-cmd="$cmd"
-args="$args"
-SERVICE_NAME="$SERVICE_NAME"
-SERVICE_PID_FILE="$SERVICE_PID_FILE"
-LOG_DIR="$LOG_DIR"
-execute_command="$execute_command"
-\$execute_command 2>>"/dev/stderr" >>"\$LOG_DIR/\$SERVICE_NAME.log" &
-execPid=\$!
-sleep 1
-checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || false)"
-[ -n "\$execPid"  ] && [ -n "\$checkPID" ] && echo "\$execPid" >"\$SERVICE_PID_FILE" && retVal=0 || retVal=10
-[ "\$retVal" = 0 ] || echo "Failed to start $execute_command" >&2
-exit \$retVal
-
-EOF
+					local _q_su _q_cmd _q_args
+					_q_su=''
+					[ -n "$su_exec" ] && _q_su=$(printf '%q ' $su_exec)
+					_q_cmd=$(printf '%q' "$cmd")
+					_q_args=''
+					[ -n "$args" ] && _q_args=$(printf '%q ' $args)
+					{
+						printf '#!/usr/bin/env bash\n'
+						printf "trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f \"\$SERVICE_PID_FILE\" ] && rm -Rf \"\$SERVICE_PID_FILE\";exit \$exitCode' EXIT\n"
+						printf 'set -Eeo pipefail\n'
+						printf '# Setting up %s to run as %s\n' "$cmd" "${SERVICE_USER:-root}"
+						printf 'retVal=10\n'
+						printf 'SERVICE_NAME=%q\n' "$SERVICE_NAME"
+						printf 'SERVICE_PID_FILE=%q\n' "$SERVICE_PID_FILE"
+						printf 'LOG_DIR=%q\n' "$LOG_DIR"
+						printf '%s %s %s 2>>"/dev/stderr" >>"$LOG_DIR/$SERVICE_NAME.log" &\n' \
+							"$_q_su" "$_q_cmd" "$_q_args"
+						printf 'execPid=$!\n'
+						printf 'sleep 1\n'
+						printf 'if [ -n "$execPid" ] && kill -0 "$execPid" 2>/dev/null; then\n'
+						printf '  echo "$execPid" >"$SERVICE_PID_FILE"\n'
+						printf '  retVal=0\n'
+						printf 'else\n'
+						printf '  retVal=10\n'
+						printf '  echo "Failed to start service %s" >&2\n' "$cmd"
+						printf 'fi\n'
+						printf 'exit $retVal\n'
+					} >"$START_SCRIPT"
+					printf '%s' "$_script_hash" >"${START_SCRIPT}.hash"
 				fi
 			fi
 		fi
-		[ -x "$START_SCRIPT" ] || chmod 755 -Rf "$START_SCRIPT"
-		[ "$CONTAINER_INIT" = "yes" ] || eval sh -c "$START_SCRIPT"
-		runExitCode=$?
+		if [ ! -x "$START_SCRIPT" ]; then
+			chmod 755 -Rf "$START_SCRIPT"
+		fi
+		if [ "$CONTAINER_INIT" != "yes" ]; then
+			# W15: launch as bash, not sh, since the generated script uses bash-specific features
+			bash "$START_SCRIPT"
+			runExitCode=$?
+		fi
 	fi
 	return $runExitCode
 }
@@ -544,7 +652,7 @@ __run_secure_function() {
 		for filesperms in "${USER_FILE_PREFIX}"/*; do
 			if [ -e "$filesperms" ]; then
 				chmod -Rf 600 "$filesperms"
-				chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null
+				[ -n "$SERVICE_USER" ] && chown -Rf "$SERVICE_USER:$SERVICE_USER" "$filesperms" 2>/dev/null
 			fi
 		done 2>/dev/null | tee -p -a "/data/logs/init.txt"
 	fi
@@ -552,7 +660,7 @@ __run_secure_function() {
 		for filesperms in "${ROOT_FILE_PREFIX}"/*; do
 			if [ -e "$filesperms" ]; then
 				chmod -Rf 600 "$filesperms"
-				chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null
+				[ -n "$SERVICE_USER" ] && chown -Rf "$SERVICE_USER:$SERVICE_USER" "$filesperms" 2>/dev/null
 			fi
 		done 2>/dev/null | tee -p -a "/data/logs/init.txt"
 	fi
@@ -560,39 +668,67 @@ __run_secure_function() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Allow ENV_ variable - Import env file
-__file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" && . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"
-__file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" && . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh"
+if __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"; then
+	. "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"
+fi
+if __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh"; then
+	. "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # default exit code
 SERVICE_EXIT_CODE=0
 # application specific
-# set the binary name
 EXEC_CMD_NAME="${EXEC_CMD_BIN##*/}"
-# set the pid file location
 SERVICE_PID_FILE="/run/init.d/$EXEC_CMD_NAME.pid"
-# check if running
-SERVICE_PID_NUMBER="$(__pgrep "$EXEC_CMD_NAME" || echo '')"
-# set full path
-EXEC_CMD_BIN="$(type -P "$EXEC_CMD_BIN" || echo "$EXEC_CMD_BIN")"
-# set full path
-EXEC_PRE_SCRIPT="$(type -P "$EXEC_PRE_SCRIPT" || echo "$EXEC_PRE_SCRIPT")"
+_resolved="$(type -P "$EXEC_CMD_BIN" 2>/dev/null)"
+[ -n "$_resolved" ] && EXEC_CMD_BIN="$_resolved"
+_resolved="$(type -P "$EXEC_PRE_SCRIPT" 2>/dev/null)"
+[ -n "$_resolved" ] && EXEC_PRE_SCRIPT="$_resolved"
+unset _resolved
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-# Only run check
-__check_service "$1" && SERVICE_IS_RUNNING=yes || SERVICE_IS_RUNNING="no"
+# Only run check when explicitly requested
+if [ "$1" = "check" ] && __check_service "$1"; then
+	SERVICE_IS_RUNNING=yes
+elif [ "$1" = "check" ]; then
+	SERVICE_IS_RUNNING="no"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ensure needed directories exists
-[ -d "$LOG_DIR" ] || mkdir -p "$LOG_DIR"
-[ -d "$RUN_DIR" ] || mkdir -p "$RUN_DIR"
+if [ ! -d "$LOG_DIR" ]; then
+	mkdir -p "$LOG_DIR"
+fi
+if [ ! -d "$RUN_DIR" ]; then
+	mkdir -p "$RUN_DIR"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # create auth directories
-[ -n "$USER_FILE_PREFIX" ] && { [ -d "$USER_FILE_PREFIX" ] || mkdir -p "$USER_FILE_PREFIX"; }
-[ -n "$ROOT_FILE_PREFIX" ] && { [ -d "$ROOT_FILE_PREFIX" ] || mkdir -p "$ROOT_FILE_PREFIX"; }
+if [ -n "$USER_FILE_PREFIX" ]; then
+	if [ ! -d "$USER_FILE_PREFIX" ]; then
+		mkdir -p "$USER_FILE_PREFIX"
+	fi
+fi
+if [ -n "$ROOT_FILE_PREFIX" ]; then
+	if [ ! -d "$ROOT_FILE_PREFIX" ]; then
+		mkdir -p "$ROOT_FILE_PREFIX"
+	fi
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-[ -n "$RUNAS_USER" ] || RUNAS_USER="root"
-[ -n "$SERVICE_USER" ] || SERVICE_USER="$RUNAS_USER"
-[ -n "$SERVICE_GROUP" ] || SERVICE_GROUP="${SERVICE_USER:-$RUNAS_USER}"
-[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes" && __is_htdocs_mounted
-[ "$IS_WEB_SERVER" = "yes" ] && [ -z "$SERVICE_PORT" ] && SERVICE_PORT="80"
+if [ -z "$RUNAS_USER" ]; then
+	RUNAS_USER="root"
+fi
+if [ -z "$SERVICE_USER" ]; then
+	SERVICE_USER="$RUNAS_USER"
+fi
+if [ -z "$SERVICE_GROUP" ]; then
+	SERVICE_GROUP="${SERVICE_USER:-$RUNAS_USER}"
+fi
+if [ "$IS_WEB_SERVER" = "yes" ]; then
+	RESET_ENV="yes"
+	__is_htdocs_mounted
+fi
+if [ "$IS_WEB_SERVER" = "yes" ] && [ -z "$SERVICE_PORT" ]; then
+	SERVICE_PORT="80"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Database env
 if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then
@@ -602,11 +738,15 @@ if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; t
 	DATABASE_PASS_NORMAL="${ENV_DATABASE_PASSWORD:-${DATABASE_PASS_NORMAL:-$user_pass}}"
 	DATABASE_USER_ROOT="${ENV_DATABASE_ROOT_USER:-${DATABASE_USER_ROOT:-$root_user_name}}"
 	DATABASE_PASS_ROOT="${ENV_DATABASE_ROOT_PASSWORD:-${DATABASE_PASS_ROOT:-$root_user_pass}}"
-	if [ -n "$DATABASE_PASS_NORMAL" ] && [ ! -f "${USER_FILE_PREFIX}/db_pass_user" ]; then
-		echo "$DATABASE_PASS_NORMAL" >"${USER_FILE_PREFIX}/db_pass_user"
+	if [ -n "$DATABASE_PASS_NORMAL" ]; then
+		if [ ! -f "${USER_FILE_PREFIX}/db_pass_user" ]; then
+			echo "$DATABASE_PASS_NORMAL" >"${USER_FILE_PREFIX}/db_pass_user"
+		fi
 	fi
-	if [ -n "$DATABASE_PASS_ROOT" ] && [ ! -f "${ROOT_FILE_PREFIX}/db_pass_root" ]; then
-		echo "$DATABASE_PASS_ROOT" >"${ROOT_FILE_PREFIX}/db_pass_root"
+	if [ -n "$DATABASE_PASS_ROOT" ]; then
+		if [ ! -f "${ROOT_FILE_PREFIX}/db_pass_root" ]; then
+			echo "$DATABASE_PASS_ROOT" >"${ROOT_FILE_PREFIX}/db_pass_root"
+		fi
 	fi
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -615,77 +755,123 @@ if [ "$DATABASE_SERVICE_TYPE" = "custom" ]; then
 	DATABASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
 	DATABASE_BASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
 	DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_CUSTOM:-/usr/local/share/httpd/admin/databases}"
-	[ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_CUSTOM:-/admin/dbadmin}"
+	if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+		SERVER_ADMIN_URL="${SERVER_ADMIN_URL_CUSTOM:-/admin/dbadmin}"
+	fi
 elif [ "$SERVICE_NAME" = "redis" ] || [ "$DATABASE_SERVICE_TYPE" = "redis" ]; then
 	DATABASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
 	DATABASE_BASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
 	DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_REDIS:-/usr/local/share/httpd/admin/redis}"
-	[ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_REDIS:-/admin/redis}"
+	if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+		SERVER_ADMIN_URL="${SERVER_ADMIN_URL_REDIS:-/admin/redis}"
+	fi
 elif [ "$SERVICE_NAME" = "postgres" ] || [ "$DATABASE_SERVICE_TYPE" = "postgres" ]; then
 	DATABASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
 	DATABASE_BASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
 	DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_POSTGRES:-/usr/local/share/httpd/admin/postgres}"
-	[ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_POSTGRES:-/admin/postgres}"
+	if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+		SERVER_ADMIN_URL="${SERVER_ADMIN_URL_POSTGRES:-/admin/postgres}"
+	fi
 elif [ "$SERVICE_NAME" = "mariadb" ] || [ "$DATABASE_SERVICE_TYPE" = "mariadb" ]; then
 	DATABASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
 	DATABASE_BASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
 	DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MARIADB:-/usr/local/share/httpd/admin/mysql}"
-	[ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MARIADB:-/admin/mysql}"
+	if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+		SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MARIADB:-/admin/mysql}"
+	fi
 elif [ "$SERVICE_NAME" = "mysql" ] || [ "$DATABASE_SERVICE_TYPE" = "mysql" ]; then
 	DATABASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
 	DATABASE_BASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
 	DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MYSQL:-/usr/local/share/httpd/admin/mysql}"
-	[ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MYSQL:-/admin/mysql}"
+	if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+		SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MYSQL:-/admin/mysql}"
+	fi
 elif [ "$SERVICE_NAME" = "couchdb" ] || [ "$DATABASE_SERVICE_TYPE" = "couchdb" ]; then
 	DATABASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
 	DATABASE_BASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
 	DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_COUCHDB:-/usr/local/share/httpd/admin/couchdb}"
-	[ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_COUCHDB:-/admin/couchdb}"
+	if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+		SERVER_ADMIN_URL="${SERVER_ADMIN_URL_COUCHDB:-/admin/couchdb}"
+	fi
 elif [ "$SERVICE_NAME" = "mongodb" ] || [ "$DATABASE_SERVICE_TYPE" = "mongodb" ]; then
 	DATABASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
 	DATABASE_BASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
 	DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MONGODB:-/usr/local/share/httpd/admin/mongodb}"
-	[ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MONGODB:-/admin/mongodb}"
+	if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+		SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MONGODB:-/admin/mongodb}"
+	fi
 elif [ "$SERVICE_NAME" = "supabase" ] || [ "$DATABASE_SERVICE_TYPE" = "supabase" ]; then
 	DATABASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
 	DATABASE_BASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
 	DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SUPABASE:-/usr/local/share/httpd/admin/supabase}"
-	[ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SUPBASE:-/admin/supabase}"
+	if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+		SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SUPBASE:-/admin/supabase}"
+	fi
 elif [ "$SERVICE_NAME" = "sqlite" ] || [ "$DATABASE_SERVICE_TYPE" = "sqlite" ]; then
 	DATABASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
 	DATABASE_BASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
 	DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SQLITE:-/usr/local/share/httpd/admin/sqlite}"
-	[ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SQLITE:-/admin/sqlite}"
-	[ -d "$DATABASE_DIR" ] || mkdir -p "$DATABASE_DIR"
+	if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+		SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SQLITE:-/admin/sqlite}"
+	fi
+	if [ ! -d "$DATABASE_DIR" ]; then
+		mkdir -p "$DATABASE_DIR"
+	fi
 	chmod 777 "$DATABASE_DIR"
 fi
-[ -n "$DATABASE_ADMIN_WWW_ROOT" ] && { [ ! -d "$DATABASE_ADMIN_WWW_ROOT" ] || mkdir -p "${DATABASE_ADMIN_WWW_ROOT}"; }
+if [ -n "$DATABASE_ADMIN_WWW_ROOT" ]; then
+	if [ ! -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+		mkdir -p "${DATABASE_ADMIN_WWW_ROOT}"
+	fi
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Allow variables via imports - Overwrite existing
-[ -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ] && . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"
+if [ -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ]; then
+	. "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # set password to random if variable is random
-[ "$user_pass" = "random" ] && user_pass="$(__random_password ${RANDOM_PASS_USER:-16})"
+if [ "$user_pass" = "random" ]; then
+	user_pass="$(__random_password ${RANDOM_PASS_USER:-16})"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-[ "$root_user_pass" = "random" ] && root_user_pass="$(__random_password ${RANDOM_PASS_ROOT:-16})"
+if [ "$root_user_pass" = "random" ]; then
+	root_user_pass="$(__random_password ${RANDOM_PASS_ROOT:-16})"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Allow setting initial users and passwords via environment and save to file
-[ -n "$user_name" ] && echo "$user_name" >"${USER_FILE_PREFIX}/${SERVICE_NAME}_name"
-[ -n "$user_pass" ] && echo "$user_pass" >"${USER_FILE_PREFIX}/${SERVICE_NAME}_pass"
-[ -n "$root_user_name" ] && echo "$root_user_name" >"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name"
-[ -n "$root_user_pass" ] && echo "$root_user_pass" >"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# create needed dirs
-[ -d "$LOG_DIR" ] || mkdir -p "$LOG_DIR"
-[ -d "$RUN_DIR" ] || mkdir -p "$RUN_DIR"
+if [ -n "$user_name" ]; then
+	echo "$user_name" >"${USER_FILE_PREFIX}/${SERVICE_NAME}_name"
+fi
+if [ -n "$user_pass" ]; then
+	echo "$user_pass" >"${USER_FILE_PREFIX}/${SERVICE_NAME}_pass"
+fi
+if [ -n "$root_user_name" ]; then
+	echo "$root_user_name" >"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name"
+fi
+if [ -n "$root_user_pass" ]; then
+	echo "$root_user_pass" >"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Allow per init script usernames and passwords
-__file_exists_with_content "${USER_FILE_PREFIX}/${SERVICE_NAME}_name" && user_name="$(<"${USER_FILE_PREFIX}/${SERVICE_NAME}_name")"
-__file_exists_with_content "${USER_FILE_PREFIX}/${SERVICE_NAME}_pass" && user_pass="$(<"${USER_FILE_PREFIX}/${SERVICE_NAME}_pass")"
-__file_exists_with_content "${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name" && root_user_name="$(<"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name")"
-__file_exists_with_content "${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass" && root_user_pass="$(<"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass")"
-__file_exists_with_content "${USER_FILE_PREFIX}/db_pass_user" && DATABASE_PASS_NORMAL="$(<"${USER_FILE_PREFIX}/db_pass_user")"
-__file_exists_with_content "${ROOT_FILE_PREFIX}/db_pass_root" && DATABASE_PASS_ROOT="$(<"${ROOT_FILE_PREFIX}/db_pass_root")"
+if __file_exists_with_content "${USER_FILE_PREFIX}/${SERVICE_NAME}_name"; then
+	user_name="$(<"${USER_FILE_PREFIX}/${SERVICE_NAME}_name")"
+fi
+if __file_exists_with_content "${USER_FILE_PREFIX}/${SERVICE_NAME}_pass"; then
+	user_pass="$(<"${USER_FILE_PREFIX}/${SERVICE_NAME}_pass")"
+fi
+if __file_exists_with_content "${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name"; then
+	root_user_name="$(<"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name")"
+fi
+if __file_exists_with_content "${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass"; then
+	root_user_pass="$(<"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass")"
+fi
+if __file_exists_with_content "${USER_FILE_PREFIX}/db_pass_user"; then
+	DATABASE_PASS_NORMAL="$(<"${USER_FILE_PREFIX}/db_pass_user")"
+fi
+if __file_exists_with_content "${ROOT_FILE_PREFIX}/db_pass_root"; then
+	DATABASE_PASS_ROOT="$(<"${ROOT_FILE_PREFIX}/db_pass_root")"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # set hostname for script
 sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
@@ -752,7 +938,7 @@ __fix_permissions "$SERVICE_USER" "$SERVICE_GROUP"
 __run_pre_execute_checks 2>/dev/stderr | tee -a -p "/data/logs/entrypoint.log" "/data/logs/init.txt" || return 20
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __run_start_script 2>>/dev/stderr | tee -p -a "/data/logs/entrypoint.log"
-errorCode=$?
+errorCode=${PIPESTATUS[0]}
 if [ -n "$EXEC_CMD_BIN" ]; then
 	if [ "$errorCode" -eq 0 ]; then
 		SERVICE_EXIT_CODE=0
@@ -760,12 +946,14 @@ if [ -n "$EXEC_CMD_BIN" ]; then
 	else
 		SERVICE_EXIT_CODE=$errorCode
 		SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
-		[ -s "$SERVICE_PID_FILE" ] || rm -Rf "$SERVICE_PID_FILE"
+		if [ ! -s "$SERVICE_PID_FILE" ]; then
+			rm -Rf "$SERVICE_PID_FILE"
+		fi
 	fi
-	SERVICE_EXIT_CODE=0
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # start the post execute function in background
 __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __script_exit $SERVICE_EXIT_CODE
+# vim: set ft=sh ts=4 sw=4 st=4 et :