From 7154042af6e4d9aa8e3e26c3aba0bbbd6e7cb4cf Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Mon, 26 Oct 2009 19:37:21 -0400 Subject: Check for swap.state instead --- config/squid/squid.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/squid/squid.inc b/config/squid/squid.inc index 3063e78b..f4c16925 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -257,8 +257,8 @@ function squid_deinstall_command() { $logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/log'); mwexec('rm -rf $cachedir'); mwexec('rm -rf $logdir'); - if(isdir("/var/squid/cache")) - mwexec("rm -rf /var/squid/cache"); + if(is_file("/var/squid/swap.state")) + mwexec("rm -rf /var/squid/cache/swap.state"); mwexec('rm -f /usr/local/etc/rc.d/proxy_monitor.sh'); mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | grep -v \"php\" | awk '{ print $2 }' | xargs kill"); mwexec("ps awux | grep \"squid\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill"); -- cgit v1.2.3