From 30351682621b151ce428793750e034317714312a Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 7 Jul 2024 13:50:56 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh --- rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh b/rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh index 9d4dae5..c5ef907 100755 --- a/rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh +++ b/rootfs/usr/local/etc/docker/init.d/zz-ifconfig.sh @@ -119,13 +119,10 @@ SERVICE_UID="0" # set the user id SERVICE_GID="0" # set the group id # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # execute command variables - keep single quotes variables will be expanded later -EXEC_CMD_BIN='echoip ' # command to execute -EXEC_CMD_ARGS='-r -s -p -l :$SERVICE_PORT -H X-Real-IP -H x-forwarded-for ' # command arguments -EXEC_CMD_ARGS+='-t /opt/echoip/html ' # command arguments -EXEC_CMD_ARGS+='-a /opt/echoip/geoip/GeoLite2-ASN.mmdb ' # command arguments -EXEC_CMD_ARGS+='-c /opt/echoip/geoip/GeoLite2-City.mmdb ' # command arguments -EXEC_CMD_ARGS+='-f /opt/echoip/geoip/GeoLite2-Country.mmdb ' # command arguments -EXEC_PRE_SCRIPT='sleep 60' # execute script before +EXEC_CMD_BIN='echoip' # command to execute +EXEC_CMD_ARGS='-r -s -p -l :$SERVICE_PORT -H X-Real-IP -H x-forwarded-for ' # command arguments +EXEC_CMD_ARGS+='-t /opt/echoip/html -a /opt/echoip/geoip -c /opt/echoip/geoip -f /opt/echoip/geoip /GeoLite2-Country.mmdb ' # command arguments +EXEC_PRE_SCRIPT='sleep 60' # execute script before # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Is this service a web server IS_WEB_SERVER="no" @@ -368,8 +365,7 @@ __run_start_script() { eval env -i HOME="$home" LC_CTYPE="$lc_type" PATH="$path" HOSTNAME="$sysname" USER="${SERVICE_USER:-$RUNAS_USER}" $extra_env sh -c "$cmd_exec" || return 10 else - su_cmd sh -c "$cmd_exec" || - eval "$cmd_exec" || return 10 + su_cmd sh -c "$cmd_exec" || eval "$cmd_exec" || return 10 fi fi fi