aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2014-02-20 15:32:18 -0500
committerbmeeks8 <bmeeks8@bellsouth.net>2014-02-20 15:32:18 -0500
commitf8f2d8493be025464627ba990133a542bd071700 (patch)
treefd0dd2b1824d0b4c321a160ce01482f48203dbe5 /config
parentf5db56193887749bc9998218f0aa3b91723f249d (diff)
downloadpfsense-packages-f8f2d8493be025464627ba990133a542bd071700.tar.gz
pfsense-packages-f8f2d8493be025464627ba990133a542bd071700.tar.bz2
pfsense-packages-f8f2d8493be025464627ba990133a542bd071700.zip
unlink() can't delete directory, use "/bin/rm -rf" instead.
Diffstat (limited to 'config')
-rw-r--r--config/suricata/suricata_uninstall.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/config/suricata/suricata_uninstall.php b/config/suricata/suricata_uninstall.php
index 071a89a4..0a7f8d5a 100644
--- a/config/suricata/suricata_uninstall.php
+++ b/config/suricata/suricata_uninstall.php
@@ -73,8 +73,8 @@ if ($config['installedpackages']['suricata']['config'][0]['clearlogs'] == 'on')
}
/* Remove the Suricata GUI app directories */
-@unlink("/usr/local/pkg/suricata");
-@unlink("/usr/local/www/suricata");
+mwexec("/bin/rm -rf /usr/local/pkg/suricata");
+mwexec("/bin/rm -rf /usr/local/www/suricata");
/* Keep this as a last step */
if ($config['installedpackages']['suricata']['config'][0]['forcekeepsettings'] != 'on') {
@@ -83,7 +83,6 @@ if ($config['installedpackages']['suricata']['config'][0]['forcekeepsettings'] !
unset($config['installedpackages']['suricatasync']);
@unlink("{$suricata_rules_upd_log}");
mwexec("/bin/rm -rf {$suricatalogdir}");
- @unlink(SURICATALOGDIR);
log_error(gettext("[Suricata] The package has been removed from this system..."));
}