Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

move call to get_binary_name into FTLcheckUpdate() to avoid having to run that first

Browse source 
Signed-off-by: Adam Warner <adamw@rner.email>
This commit is contained in:
Adam Warner 2018-04-02 23:22:06 +01:00
parent 56278c6394
commit f37b2bc7c1
No known key found for this signature in database
GPG key ID: F5410858022DA5EB
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
advanced/Scripts/update.sh
View file

@ -110,8 +110,6 @@ main() {
echo -e " ${INFO} Pi-hole Core:\\t${COL_LIGHT_GREEN}up to date${COL_NC}" echo -e " ${INFO} Pi-hole Core:\\t${COL_LIGHT_GREEN}up to date${COL_NC}"
fi fi
get_binary_name > /dev/null # Needed so that we have the correct binary name for the FTL Update check function
if FTLcheckUpdate > /dev/null; then if FTLcheckUpdate > /dev/null; then
FTL_update=true FTL_update=true
echo -e " ${INFO} FTL:\\t\\t${COL_YELLOW}update available${COL_NC}" echo -e " ${INFO} FTL:\\t\\t${COL_YELLOW}update available${COL_NC}"

14
automated install/basic-install.sh
View file

@ -1893,7 +1893,14 @@ get_binary_name() {
FTLcheckUpdate() FTLcheckUpdate()
{ {
local ftlLoc=$(which pihole-FTL 2>/dev/null) get_binary_name
#In the next section we check to see if FTL is already installed (in case of pihole -r).
#If the installed version matches the latest version, then check the installed sha1sum of the binary vs the remote sha1sum. If they do not match, then download
echo -e " ${INFO} Checking for existing FTL binary..."
local ftlLoc
ftlLoc=$(which pihole-FTL 2>/dev/null)
local ftlBranch local ftlBranch
@ -1957,11 +1964,6 @@ FTLdetect() {
echo "" echo ""
echo -e " ${INFO} FTL Checks..." echo -e " ${INFO} FTL Checks..."
get_binary_name
#In the next section we check to see if FTL is already installed (in case of pihole -r).
#If the installed version matches the latest version, then check the installed sha1sum of the binary vs the remote sha1sum. If they do not match, then download
echo -e " ${INFO} Checking for existing FTL binary..."
if FTLcheckUpdate ; then if FTLcheckUpdate ; then
FTLinstall "${binary}" || return 1 FTLinstall "${binary}" || return 1
fi fi