From 8afdaf11953983ad498870b6b57cfcf09c3ac6b3 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Fri, 2 Apr 2021 15:22:55 +1000 Subject: [PATCH] cache-domains: Fixed host files directory * Hid unnecessary output Signed-off-by: Gerard Ryan --- utils/cache-domains/Makefile | 2 +- utils/cache-domains/files/cache-domains | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/cache-domains/Makefile b/utils/cache-domains/Makefile index 7c27f1bd3..fce59ff0e 100644 --- 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 diff --git a/utils/cache-domains/files/cache-domains b/utils/cache-domains/files/cache-domains index d7e4412fc..45c6f1fcd 100644 --- 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