mirror of
https://github.com/casjaysdevdocker/tor
synced 2025-10-30 14:02:32 -04:00
🗃️ Update codebase 🗃️
rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh rootfs/usr/local/etc/docker/init.d/03-tor-server.sh rootfs/usr/local/etc/docker/functions/entrypoint.sh rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh rootfs/usr/local/etc/docker/init.d/03-tor-server.sh
This commit is contained in:
@@ -798,19 +798,14 @@ __start_init_scripts() {
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# Service uses PID tracking - verify actual running processes
|
# Service uses PID tracking - verify actual running processes
|
||||||
set +e # Temporarily disable exit on error
|
|
||||||
retPID=""
|
retPID=""
|
||||||
|
|
||||||
# First, try to find actual running process with various name patterns
|
# First, try to find actual running process with various name patterns
|
||||||
for name_variant in "$service" "${service}84" "${service}d" "$(echo "$service" | sed 's/-//g')" "$(echo "$service" | tr -d '-')"; do
|
for name_variant in "$service" "${service//-*/}" "${service//-/_}"; do
|
||||||
if [ -z "$retPID" ]; then
|
if [ -z "$retPID" ]; then
|
||||||
retPID=$(__get_pid "$name_variant" 2>/dev/null || echo "")
|
retPID=$(__get_pid "$name_variant" 2>/dev/null || echo "")
|
||||||
[ -n "$retPID" ] && found_process="$name_variant" && break
|
[ -n "$retPID" ] && found_process="$name_variant" && break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
set -e # Re-enable exit on error
|
|
||||||
|
|
||||||
if [ -n "$retPID" ] && [ "$retPID" != "0" ]; then
|
if [ -n "$retPID" ] && [ "$retPID" != "0" ]; then
|
||||||
# Found actual running process
|
# Found actual running process
|
||||||
initStatus="0"
|
initStatus="0"
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ __run_precopy() {
|
|||||||
# Define environment
|
# Define environment
|
||||||
local hostname=${HOSTNAME}
|
local hostname=${HOSTNAME}
|
||||||
# Define actions/commands
|
# Define actions/commands
|
||||||
[ -d "$DATA_DIR" ] && mkdir -p "$DATA_DIR"
|
[ -d "$DATA_DIR" ] || mkdir -p "$DATA_DIR"
|
||||||
|
|
||||||
# allow custom functions
|
# 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
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ __run_precopy() {
|
|||||||
# Define environment
|
# Define environment
|
||||||
local hostname=${HOSTNAME}
|
local hostname=${HOSTNAME}
|
||||||
# Define actions/commands
|
# Define actions/commands
|
||||||
[ -d "$DATA_DIR" ] && mkdir -p "$DATA_DIR"
|
[ -d "$DATA_DIR" ] || mkdir -p "$DATA_DIR"
|
||||||
|
|
||||||
# allow custom functions
|
# 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
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ __run_precopy() {
|
|||||||
# Define environment
|
# Define environment
|
||||||
local hostname=${HOSTNAME}
|
local hostname=${HOSTNAME}
|
||||||
# Define actions/commands
|
# Define actions/commands
|
||||||
[ -d "$DATA_DIR" ] && mkdir -p "$DATA_DIR"
|
[ -d "$DATA_DIR" ] || mkdir -p "$DATA_DIR"
|
||||||
|
|
||||||
# allow custom functions
|
# 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
|
||||||
|
|||||||
Reference in New Issue
Block a user