From 05b9ead706b68a8bc80707363c113b22a4249c84 Mon Sep 17 00:00:00 2001 From: casjay Date: Fri, 26 Jun 2026 18:47:23 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Remove=20stale=20local=20functio?= =?UTF-8?q?n=20definitions=20from=20init.d=20script=20=F0=9F=90=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit __pcheck and __pgrep 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/01-php-fpm.sh: remove stale local __pcheck/__pgrep definitions and their intro comment; defer to shared library rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh rootfs/usr/local/etc/docker/init.d/zz-caddy.sh --- rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh | 4 ---- rootfs/usr/local/etc/docker/init.d/zz-caddy.sh | 4 ---- 2 files changed, 8 deletions(-) diff --git a/rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh b/rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh index 3f49a06..2a9d093 100644 --- a/rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh +++ b/rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh @@ -123,9 +123,6 @@ __run_start_script() { esac } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# 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; } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Allow ENV_ variable # Import env file @@ -156,7 +153,6 @@ if [ ! -f "$(type -P "$EXEC_CMD_BIN")" ] && [ -z "$EXEC_CMD_BIN" ]; then exit 2 fi # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# check if process is already running if __pgrep "$EXEC_CMD_BIN"; then SERVICE_IS_RUNNING="true" echo "$EXEC_CMD_BIN is running" diff --git a/rootfs/usr/local/etc/docker/init.d/zz-caddy.sh b/rootfs/usr/local/etc/docker/init.d/zz-caddy.sh index 648093a..721d352 100644 --- a/rootfs/usr/local/etc/docker/init.d/zz-caddy.sh +++ b/rootfs/usr/local/etc/docker/init.d/zz-caddy.sh @@ -118,9 +118,6 @@ __run_start_script() { esac } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# 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; } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Allow ENV_ variable # Import env file @@ -151,7 +148,6 @@ if [ ! -f "$(type -P "$EXEC_CMD_BIN")" ] && [ -z "$EXEC_CMD_BIN" ]; then exit 2 fi # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# check if process is already running if __pgrep "$EXEC_CMD_BIN"; then SERVICE_IS_RUNNING="true" echo "$EXEC_CMD_BIN is running"