Let users know we skipped the FTL checks

Co-authored-by: davygravy <davygravy@users.noreply.github.com>
Signed-off-by: Christian König <github@yubiuser.dev>
This commit is contained in:
Christian König 2025-03-03 22:19:32 +01:00
parent f67a8e5110
commit f3e04117f6
No known key found for this signature in database

View File

@ -2228,7 +2228,7 @@ main() {
# Check if there is a usable FTL binary available on this architecture - do # Check if there is a usable FTL binary available on this architecture - do
# this early on as FTL is a hard dependency for Pi-hole # this early on as FTL is a hard dependency for Pi-hole
# Allow the user to skip this check if they are using a self-compiled FTL binary from an unsupported architecture # Allow the user to skip this check if they are using a self-compiled FTL binary from an unsupported architecture
if [ ! "${PIHOLE_SKIP_FTL_CHECK}" = true ]; then if [ "${PIHOLE_SKIP_FTL_CHECK}" != true ]; then
# Get the binary name for the current architecture # Get the binary name for the current architecture
local funcOutput local funcOutput
funcOutput=$(get_binary_name) #Store output of get_binary_name here funcOutput=$(get_binary_name) #Store output of get_binary_name here
@ -2237,6 +2237,8 @@ main() {
printf " %b Upgrade/install aborted\\n" "${CROSS}" "${DISTRO_NAME}" printf " %b Upgrade/install aborted\\n" "${CROSS}" "${DISTRO_NAME}"
exit 1 exit 1
fi fi
else
printf " %b %bPIHOLE_SKIP_FTL_CHECK env variable set to true - skipping architecture check%b\\n" "${INFO}" "${COL_LIGHT_GREEN}" "${COL_NC}"
fi fi
if [[ "${fresh_install}" == false ]]; then if [[ "${fresh_install}" == false ]]; then
@ -2279,7 +2281,7 @@ main() {
# Download and install FTL # Download and install FTL
# Allow the user to skip this check if they are using a self-compiled FTL binary from an unsupported architecture # Allow the user to skip this check if they are using a self-compiled FTL binary from an unsupported architecture
if [ ! "${PIHOLE_SKIP_FTL_CHECK}" = true ]; then if [ "${PIHOLE_SKIP_FTL_CHECK}" != true ]; then
local binary 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) 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 local theRest
@ -2288,6 +2290,8 @@ main() {
printf " %b FTL Engine not installed\\n" "${CROSS}" printf " %b FTL Engine not installed\\n" "${CROSS}"
exit 1 exit 1
fi fi
else
printf " %b %bPIHOLE_SKIP_FTL_CHECK env variable set to true - skipping FTL binary installation%b\\n" "${INFO}" "${COL_LIGHT_GREEN}" "${COL_NC}"
fi fi
# Install and log everything to a file # Install and log everything to a file