From f360959efc465233d57d4f0bbc5b385bbbbfea9c Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 9 Jan 2019 19:26:19 +0100 Subject: [PATCH 1/2] Download macvendor database from ftl.pi-hole.net when downloading a new FTL binary. Users who want to update the database more frequently than on each FTL release can use the python script from the FTL repository to generate the database themselves. The macvendor database is an optional component so a failing download is no reason to interrupt the installer. Signed-off-by: DL6ER --- automated install/basic-install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 990b1f34..132a96e5 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -2174,6 +2174,10 @@ FTLinstall() { # If we downloaded binary file (as opposed to text), if sha1sum --status --quiet -c "${binary}".sha1; then printf "transferred... " + + # Before stopping FTL, we download the macvendor database + curl -sSL "https://ftl.pi-hole.net/macvendor.db" -o "${PI_HOLE_CONFIG_DIR}/macvendor.db" + # Stop FTL stop_service pihole-FTL &> /dev/null # Install the new version with the correct permissions From 516ed83638a7344bf0d4d9970661f8a09d45198d Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 28 Jan 2019 20:48:30 +0100 Subject: [PATCH 2/2] Add "|| true" to the curl command as a failed download is no show-stopper for the overall install process. Signed-off-by: DL6ER --- automated install/basic-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 132a96e5..b7dd9a8d 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -2176,7 +2176,7 @@ FTLinstall() { printf "transferred... " # Before stopping FTL, we download the macvendor database - curl -sSL "https://ftl.pi-hole.net/macvendor.db" -o "${PI_HOLE_CONFIG_DIR}/macvendor.db" + curl -sSL "https://ftl.pi-hole.net/macvendor.db" -o "${PI_HOLE_CONFIG_DIR}/macvendor.db" || true # Stop FTL stop_service pihole-FTL &> /dev/null