Merge branch 'master' of https://github.com/pi-hole/pi-hole into v5.2.2

This commit is contained in:
Siddhu 2020-12-25 07:56:25 +05:30
commit 6d8dd918c6
7 changed files with 322 additions and 55 deletions

View file

@ -2454,7 +2454,7 @@ get_binary_name() {
elif [[ "${machine}" == "x86_64" ]]; then
# This gives the processor of packages dpkg installs (for example, "i386")
local dpkgarch
dpkgarch=$(dpkg --print-processor 2> /dev/null || true)
dpkgarch=$(dpkg --print-processor 2> /dev/null || dpkg --print-architecture 2> /dev/null)
# Special case: This is a 32 bit OS, installed on a 64 bit machine
# -> change machine processor to download the 32 bit executable