tyler.durden/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-07-31 01:24:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow uses to skip binary check and installing FTL in case the use a self-compiled binary

Browse Source 
Signed-off-by: Christian König <github@yubiuser.dev>
This commit is contained in:
Christian König 2025-02-27 12:00:25 +01:00
parent 0a36e9d949
commit 3f7f6f0294
No known key found for this signature in database
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
automated install/basic-install.sh
View File

@ -156,6 +156,7 @@ EOM
# The runUnattended flag is one example of this # The runUnattended flag is one example of this
repair=false repair=false
runUnattended=false runUnattended=false
PIHOLE_SKIP_FTL_CHECK=false
# Check arguments for the undocumented flags # Check arguments for the undocumented flags
for var in "$@"; do for var in "$@"; do
case "$var" in case "$var" in
@ -2224,6 +2225,9 @@ 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
if [ ! "${PIHOLE_SKIP_FTL_CHECK}" = true ]; then
# 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
# Abort early if this processor is not supported (get_binary_name returns empty string) # Abort early if this processor is not supported (get_binary_name returns empty string)
@ -2231,6 +2235,7 @@ 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
fi
if [[ "${fresh_install}" == false ]]; then if [[ "${fresh_install}" == false ]]; then
# if it's running unattended, # if it's running unattended,
@ -2271,6 +2276,8 @@ main() {
create_pihole_user create_pihole_user
# 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
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
@ -2279,6 +2286,7 @@ main() {
printf " %b FTL Engine not installed\\n" "${CROSS}" printf " %b FTL Engine not installed\\n" "${CROSS}"
exit 1 exit 1
fi fi
fi
# Install and log everything to a file # Install and log everything to a file
installPihole | tee -a /proc/$$/fd/3 installPihole | tee -a /proc/$$/fd/3