From 3fbb0ac8dde14b8edc1982ae3a2a021f3cf68477 Mon Sep 17 00:00:00 2001 From: Adam Hill Date: Tue, 29 Oct 2019 22:26:46 -0500 Subject: [PATCH] Adding docker+arm detection & FTL download Signed-off-by: Adam Hill --- automated install/basic-install.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index c887a6c6..bbc8b2ac 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -2305,9 +2305,15 @@ get_binary_name() { binary="pihole-FTL-arm-linux-gnueabi" fi else - printf "%b %b Detected ARM architecture\\n" "${OVER}" "${TICK}" - # set the binary to be used - 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")