cache-domains: Fixed host files directory

* Hid unnecessary output

Signed-off-by: Gerard Ryan <[email protected]>

diff --git a/utils/cache-domains/Makefile b/utils/cache-domains/Makefile
index 7c27f1bd3cb17d9362247e15d90ec7e8806a9584..fce59ff0e5b303dd91d715badcbcf42e801ed306 100644 (file)
--- a/utils/cache-domains/Makefile
+++ b/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 <[email protected]>

diff --git a/utils/cache-domains/files/cache-domains b/utils/cache-domains/files/cache-domains
index d7e4412fcccb62f37a76265150600d047c6a79cd..45c6f1fcda66d1759403c6a573003d01914ed9bf 100644 (file)
--- a/utils/cache-domains/files/cache-domains
+++ b/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