Merge pull request #15329 from G-M0N3Y-2503/cache-domains-fix

cache-domains: Fixed host files directory

utils/cache-domains/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cache-domains
-PKG_VERSION:=2.2.0
+PKG_VERSION:=2.2.1
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>

utils/cache-domains/files/cache-domains

@@ -6,7 +6,7 @@ set -e
 
 CACHE_DOMAINS_SRC="https://api.github.com/repos/uklans/cache-domains/tarball/master"
 CACHE_DOMAINS_DIR="/var/cache-domains"
-CACHE_DOMAINS_HOSTS_DIR="${CACHE_DOMAINS_DIR}/scripts/output/dnsmasq"
+CACHE_DOMAINS_HOSTS_DIR="${CACHE_DOMAINS_DIR}/scripts/output/dnsmasq/hosts"
 CONFIG_FILE="/etc/cache-domains.json"
 
 uci_changes() {
@@ -41,8 +41,8 @@ configure() {
 	INITIAL_DIR="$(pwd)"
 	cd "${CACHE_DOMAINS_DIR}/scripts/"
 	cp "${CONFIG_FILE}" "config.json"
-	./create-dnsmasq.sh
-	rm "config.json" "${CACHE_DOMAINS_HOSTS_DIR}/lancache.conf"
+	./create-dnsmasq.sh > /dev/null
+	rm "config.json" "${CACHE_DOMAINS_HOSTS_DIR}/../lancache.conf"
 	cd "${INITIAL_DIR}"
 
 	while uci_get "dhcp" "@dnsmasq[${I}]" > /dev/null; do