From fa5a7fac87bdb25dfdc4fe176e1af67ab02ac545 Mon Sep 17 00:00:00 2001 From: gSpot Date: Sun, 9 Feb 2025 00:32:32 +0300 Subject: [PATCH] uninstall.sh --- autoinstall/2.x/uninstall.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/autoinstall/2.x/uninstall.sh b/autoinstall/2.x/uninstall.sh index e280067..82568c7 100755 --- a/autoinstall/2.x/uninstall.sh +++ b/autoinstall/2.x/uninstall.sh @@ -12,9 +12,10 @@ HTDOCS_VIEW="${PREFIX}/www/luci-static/resources/view" HTDOCS_RUAB="${HTDOCS_VIEW}/ruantiblock" CRONTAB_FILE="/etc/crontabs/root" DATA_DIR="/tmp/ruantiblock" -DNSMASQ_DATA_FILE="/tmp/dnsmasq.d/02-ruantiblock.dnsmasq" +DNSMASQ_DATA_FILE="/tmp/dnsmasq*.d/02-ruantiblock.dnsmasq" DNSMASQ_DATA_FILE_TMP="${DNSMASQ_DATA_FILE}.tmp" -DNSMASQ_DATA_FILE_BYPASS="/tmp/dnsmasq.d/01-ruantiblock_bypass.dnsmasq" +DNSMASQ_DATA_FILE_BYPASS="/tmp/dnsmasq*.d/00-ruantiblock_bypass.dnsmasq" +DNSMASQ_DATA_FILE_USER_INSTANCES="/tmp/dnsmasq*.d/01-ruantiblock_user_instances.dnsmasq" SCRIPTS_DIR="/usr/share/ruantiblock" MODULES_DIR="/usr/libexec/ruantiblock" ### ruantiblock @@ -115,6 +116,7 @@ RemoveAppFiles() { RemoveFile "${FILE_BYPASS_ENTRIES}.opkg" rm -f "$DNSMASQ_DATA_FILE" rm -f "$DNSMASQ_DATA_FILE_BYPASS" + rm -f "$DNSMASQ_DATA_FILE_USER_INSTANCES" rm -rf "$DATA_DIR"/* rm -rf "$USER_LISTS_DIR" rmdir "$SCRIPTS_DIR" "$MODULES_DIR" 2> /dev/null