casjaysdevdocker/tftpd
1
0
Fork 0
mirror of https://github.com/casjaysdevdocker/tftpd synced 2026-07-14 05:45:58 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 Remove stale local function definitions from init.d script 🐛
tftpd / release-tftpd (push) Failing after 1m38s
Details

Browse Source 
__cd, __pcheck, __pgrep, and __proc_check were locally defined in
init.d scripts before they were added to the shared docker-entrypoint
functions library. These local copies shadow the improved library
versions and prevent library updates from taking effect.
- rootfs/usr/local/etc/docker/init.d/zz-nginx.sh: remove stale local __cd/__pcheck/__pgrep/__proc_check definitions; defer to shared library

rootfs/usr/local/etc/docker/init.d/zz-nginx.sh
This commit is contained in:
Jason Hempstead
2026-06-26 18:48:48 -04:00
parent 20823fa5ca
commit d600555a13
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rootfs/usr/local/etc/docker/init.d/zz-nginx.sh
-18
View File
@@ -545,26 +545,8 @@ __run_secure_function() {
fi fi
} }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# simple cd function
__cd() { mkdir -p "$1" && builtin cd "$1" || exit 1; }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# process check functions
__pcheck() { [ -n "$(type -P pgrep 2>/dev/null)" ] && pgrep -x "$1" &>/dev/null && return 0 || return 10; }
__pgrep() { __pcheck "${1:-$EXEC_CMD_BIN}" || __ps aux 2>/dev/null | grep -Fw " ${1:-$EXEC_CMD_BIN}" | grep -qv ' grep' | grep '^' && return 0 || return 10; }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# check if process is already running
__proc_check() {
cmd_bin="$(type -P "${1:-$EXEC_CMD_BIN}")"
local _b="${cmd_bin:-$EXEC_CMD_NAME}"; cmd_name="${_b##*/}"
if __pgrep "$cmd_bin" || __pgrep "$cmd_name"; then
SERVICE_IS_RUNNING="true"
touch "$SERVICE_PID_FILE"
echo "$cmd_name is already running"
return 0
else
return 1
fi
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Allow ENV_ variable - Import env file # 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}.sh" && . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"