Merge pull request #2984 from diginc/development

Adding docker+arm detection & FTL download
This commit is contained in:
Adam Warner 2019-11-27 21:25:41 +00:00 committed by GitHub
commit 9248c92b5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2332,9 +2332,15 @@ get_binary_name() {
l_binary="pihole-FTL-arm-linux-gnueabi"
fi
else
printf "%b %b Detected ARM architecture\\n" "${OVER}" "${TICK}"
# set the binary to be used
l_binary="pihole-FTL-arm-linux-gnueabi"
if [[ -f "/.dockerenv" ]]; then
printf "%b %b Detected ARM architecture in docker\\n" "${OVER}" "${TICK}"
# set the binary to be used
binary="pihole-FTL-armel-native"
else
printf "%b %b Detected ARM architecture\\n" "${OVER}" "${TICK}"
# set the binary to be used
binary="pihole-FTL-arm-linux-gnueabi"
fi
fi
elif [[ "${machine}" == "x86_64" ]]; then
# This gives the architecture of packages dpkg installs (for example, "i386")