|
|
|
@ -2655,18 +2655,6 @@ main() {
|
|
|
|
|
# Check that the installed OS is officially supported - display warning if not
|
|
|
|
|
os_check
|
|
|
|
|
|
|
|
|
|
# Check if FTL is installed - do this early on as FTL is a hard dependency for Pi-hole
|
|
|
|
|
local funcOutput
|
|
|
|
|
funcOutput=$(get_binary_name) #Store output of get_binary_name here
|
|
|
|
|
local binary
|
|
|
|
|
binary="pihole-FTL${funcOutput##*pihole-FTL}" #binary name will be the last line of the output of get_binary_name (it always begins with pihole-FTL)
|
|
|
|
|
local theRest
|
|
|
|
|
theRest="${funcOutput%pihole-FTL*}" # Print the rest of get_binary_name's output to display (cut out from first instance of "pihole-FTL")
|
|
|
|
|
if ! FTLdetect "${binary}" "${theRest}"; then
|
|
|
|
|
printf " %b FTL Engine not installed\\n" "${CROSS}"
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Install packages used by this installation script
|
|
|
|
|
install_dependent_packages "${INSTALLER_DEPS[@]}"
|
|
|
|
|
|
|
|
|
@ -2751,6 +2739,18 @@ main() {
|
|
|
|
|
# Create the pihole user
|
|
|
|
|
create_pihole_user
|
|
|
|
|
|
|
|
|
|
# Check if FTL is installed - do this early on as FTL is a hard dependency for Pi-hole
|
|
|
|
|
local funcOutput
|
|
|
|
|
funcOutput=$(get_binary_name) #Store output of get_binary_name here
|
|
|
|
|
local binary
|
|
|
|
|
binary="pihole-FTL${funcOutput##*pihole-FTL}" #binary name will be the last line of the output of get_binary_name (it always begins with pihole-FTL)
|
|
|
|
|
local theRest
|
|
|
|
|
theRest="${funcOutput%pihole-FTL*}" # Print the rest of get_binary_name's output to display (cut out from first instance of "pihole-FTL")
|
|
|
|
|
if ! FTLdetect "${binary}" "${theRest}"; then
|
|
|
|
|
printf " %b FTL Engine not installed\\n" "${CROSS}"
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Install and log everything to a file
|
|
|
|
|
installPihole | tee -a /proc/$$/fd/3
|
|
|
|
|
|
|
|
|
|