From 365b54754585afef72e1d88c0766215a1dcaad42 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 14 Nov 2018 20:42:03 +0100 Subject: [PATCH] Rename files once again and use the proper file names already in the templates directory Signed-off-by: DL6ER --- advanced/Templates/{pihole-FTL.initd => init.d/pihole-FTL} | 0 .../{pihole-FTL.systemd => systemd/pihole-FTL.service} | 0 automated install/basic-install.sh | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename advanced/Templates/{pihole-FTL.initd => init.d/pihole-FTL} (100%) rename advanced/Templates/{pihole-FTL.systemd => systemd/pihole-FTL.service} (100%) diff --git a/advanced/Templates/pihole-FTL.initd b/advanced/Templates/init.d/pihole-FTL similarity index 100% rename from advanced/Templates/pihole-FTL.initd rename to advanced/Templates/init.d/pihole-FTL diff --git a/advanced/Templates/pihole-FTL.systemd b/advanced/Templates/systemd/pihole-FTL.service similarity index 100% rename from advanced/Templates/pihole-FTL.systemd rename to advanced/Templates/systemd/pihole-FTL.service diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 32c6f4df..e2c776f4 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -2113,8 +2113,8 @@ FTLinstall() { pushd "$(mktemp -d)" > /dev/null || { printf "Unable to make temporary directory for FTL binary download\\n"; return 1; } # Always replace pihole-FTL.service - install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/pihole-FTL.initd" "/etc/init.d/pihole-FTL" - install -T -m 0644 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/pihole-FTL.systemd" "/etc/systemd/system/pihole-FTL.service" + install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/init.d/pihole-FTL" "/etc/init.d/pihole-FTL" + install -T -m 0644 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/systemd/pihole-FTL.service" "/etc/systemd/system/pihole-FTL.service" local ftlBranch local url