arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-23 07:18:07 +00:00
Code Issues Releases Wiki Activity

Make comments more pretty

Browse Source
This commit is contained in:
DL6ER 2017-02-13 14:50:25 +01:00
parent a052f397fe
commit 95d7fe76b5
No known key found for this signature in database
GPG Key ID: BB8EC0BC77973A30
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
automated install/basic-install.sh
View File

@ -1159,7 +1159,7 @@ if [[ "${reconfigure}" == true ]]; then
FTLdownload() { FTLdownload() {
# Download suitable FTL binary # Download suitable FTL binary
echo ":::" echo ":::"
echo "::: Downloading latest FTL binary..." echo "::: Downloading latest version of FTL..."
local machine=$(uname -m) local machine=$(uname -m)
@ -1168,23 +1168,24 @@ FTLdownload() {
if [[ $machine == arm* ]]; then if [[ $machine == arm* ]]; then
# ARM # ARM
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" echo "::: Detected ARM-hf architecture"
binary="pihole-FTL-arm-linux-gnueabihf" binary="pihole-FTL-arm-linux-gnueabihf"
else else
echo "Detected ARM architecture" echo "::: Detected ARM architecture"
binary="pihole-FTL-arm-linux-gnueabi" binary="pihole-FTL-arm-linux-gnueabi"
fi fi
elif [[ $machine == x86_64 ]]; then elif [[ $machine == x86_64 ]]; then
# 64bit # 64bit
echo "Detected x86_64 architecture" echo "::: Detected x86_64 architecture"
binary="pihole-FTL-linux-x86_64" binary="pihole-FTL-linux-x86_64"
else else
# Something else - we try to use 32bit executable and warn the user # Something else - we try to use 32bit executable and warn the user
if [[ ! $machine == i686 ]]; then if [[ ! $machine == i686 ]]; then
echo "Not able to detect architecture, trying 32bit executable" echo "::: Not able to detect architecture (unknown: ${machine}), trying 32bit executable"
echo "::: Contact Pi-hole support if you experience problems (like FTL not running)"
fi fi
binary="pihole-FTL-linux-x86_32" binary="pihole-FTL-linux-x86_32"
fi fi
@ -1206,7 +1207,7 @@ FTLdownload() {
FTLinstall() { FTLinstall() {
# Download suitable FTL binary # Download suitable FTL binary
echo ":::" echo ":::"
echo -n "::: Downloading latest FTL binary..." echo -n "::: Installing FTL ... "
install -m 0755 /opt/pihole/pihole-FTL /usr/local/bin install -m 0755 /opt/pihole/pihole-FTL /usr/local/bin
touch /var/log/pihole-FTL.log /var/run/pihole-FTL.pid /var/run/pihole-FTL.port touch /var/log/pihole-FTL.log /var/run/pihole-FTL.pid /var/run/pihole-FTL.port