gaspersic/pi-hole
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Download tests.

Browse Source 
Make sure we download a binary and not just get the GitHub page.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
This commit is contained in:
Dan Schaper
2017-02-20 09:36:24 -08:00
parent 7a269e757e
commit 70e876ee13
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
automated install/basic-install.sh
View File

@@ -1164,17 +1164,19 @@ FTLinstall() {
echo "::: failed (error in getting latest release location from GitHub)"
return 1
fi
if curl -sSL --fail "${latestURL}${binary}" -o "/tmp/pihole-FTL"; then
echo "::: done"
install -m 0755 /tmp/pihole-FTL /usr/bin
touch /var/log/pihole-FTL.log /var/run/pihole-FTL.pid /var/run/pihole-FTL.port
chmod 0666 /var/log/pihole-FTL.log /var/run/pihole-FTL.pid /var/run/pihole-FTL.port
return 0
else
echo "::: failed (download of binary from Github failed)"
return 1
if curl -sSL --fail "${latestURL%$'\r'}/${binary}" -o "/tmp/pihole-FTL"; then
if [[ -f /tmp/pihole-FTL ]]; then
echo "::: done"
install -m 0755 /tmp/pihole-FTL /usr/bin
touch /var/log/pihole-FTL.log /var/run/pihole-FTL.pid /var/run/pihole-FTL.port
chmod 0666 /var/log/pihole-FTL.log /var/run/pihole-FTL.pid /var/run/pihole-FTL.port
return 0
else
echo "::: failed (download of binary from Github failed)"
return 1
fi
echo "done"
fi
echo "done"
}
FTLdetect() {