mirror of
https://github.com/pi-hole/pi-hole.git
synced 2025-04-07 19:55:09 +02:00
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:
parent
02d7b16ef1
commit
b58a0ce699
@ -2340,7 +2340,7 @@ main() {
|
||||
# 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
|
||||
# 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
|
||||
local funcOutput
|
||||
funcOutput=$(get_binary_name) #Store output of get_binary_name here
|
||||
@ -2349,6 +2349,8 @@ main() {
|
||||
printf " %b Upgrade/install aborted\\n" "${CROSS}" "${DISTRO_NAME}"
|
||||
exit 1
|
||||
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
|
||||
|
||||
# in case of an update (can be a v5 -> v6 or v6 -> v6 update) or repair
|
||||
@ -2394,7 +2396,7 @@ main() {
|
||||
|
||||
# Download and install FTL
|
||||
# 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
|
||||
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
|
||||
@ -2403,6 +2405,8 @@ main() {
|
||||
printf " %b FTL Engine not installed\\n" "${CROSS}"
|
||||
exit 1
|
||||
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
|
||||
|
||||
# Install and log everything to a file
|
||||
|
Loading…
x
Reference in New Issue
Block a user