Detect if architecture is *aarch* + use hf binary only if ARMv7+ is detected

This commit is contained in:
DL6ER 2017-02-20 11:14:23 +01:00
parent 378338c684
commit f24f77c5bd
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD

View file

@ -1163,16 +1163,21 @@ FTLdownload() {
local machine=$(uname -m) local machine=$(uname -m)
echo $machine if [[ $machine == arm* || $machine == *aarch* ]]; then
if [[ $machine == arm* ]]; then
# ARM # ARM
local rev=$(uname -m | sed "s/[^0-9]//g;")
if [ -f "/lib/ld-linux-aarch64.so.1" ]; then if [ -f "/lib/ld-linux-aarch64.so.1" ]; then
echo "::: Detected ARM-aarch64 architecture" echo "::: Detected ARM-aarch64 architecture"
binary="pihole-FTL-aarch64-linux-gnu" binary="pihole-FTL-aarch64-linux-gnu"
elif [ -f "/lib/ld-linux-armhf.so.3" ]; then elif [ -f "/lib/ld-linux-armhf.so.3" ]; then
echo "::: Detected ARM-hf architecture" if [ "$rev" -gt "6" ]; then
echo "::: Detected ARM-hf architecture (armv7+)"
binary="pihole-FTL-arm-linux-gnueabihf" binary="pihole-FTL-arm-linux-gnueabihf"
else
echo "::: Detected ARM-hf architecture (armv6 or lower)"
echo "::: Using ARM binary"
binary="pihole-FTL-arm-linux-gnueabi"
fi
else else
echo "::: Detected ARM architecture" echo "::: Detected ARM architecture"
binary="pihole-FTL-arm-linux-gnueabi" binary="pihole-FTL-arm-linux-gnueabi"