From 8518f6d794924f4e8e5754957234ff9a5a47f05b Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 17 Feb 2022 15:34:54 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20modified:=20bin/entrypo?= =?UTF-8?q?int-squid.sh=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/entrypoint-squid.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/bin/entrypoint-squid.sh b/bin/entrypoint-squid.sh index 325aea4..86b03f6 100755 --- a/bin/entrypoint-squid.sh +++ b/bin/entrypoint-squid.sh @@ -16,14 +16,11 @@ export HOSTNAME="${HOSTNAME:-$(hostname -f)}" __init() { mkdir -p "/config" "/data" - for dir in apache2 e2guardian squid squidguard; do + for dir in apache2 e2guardian squid c-icap; do if [ -f "/usr/local/share/squidFiles/$dir" ]; then - cp -Rf "/usr/local/share/squidFiles/$dir" "/config/$dir" + [ -f "/config/$dir" ] || cp -Rf "/usr/local/share/squidFiles/$dir" "/config/$dir" elif [ -d "/usr/local/share/squidFiles/$dir" ]; then - cp -Rf "/usr/local/share/squidFiles/$dir/." "/config/$dir/" - else - cp -Rf "/usr/local/share/squidFiles/data/." "/data/" - cp -Rf "/usr/local/share/squidFiles/config/." "/config/" + [ -d "/config/$dir" ] || cp -Rf "/usr/local/share/squidFiles/$dir/." "/config/$dir/" fi done