Pihole -up --check-only fails on FTL

PromoFaux · February 24, 2020, 8:51am

Yep...

advanced/Scripts/update.sh

545b6605b


      
          
              if GitCheckUpdateAvail "${ADMIN_INTERFACE_DIR}" ; then
                  web_update=true
                  echo -e "  ${INFO} Web Interface:\\t${COL_YELLOW}update available${COL_NC}"
              else
                  web_update=false
                  echo -e "  ${INFO} Web Interface:\\t${COL_LIGHT_GREEN}up to date${COL_NC}"
              fi
          fi
          
          if FTLcheckUpdate > /dev/null; then
              FTL_update=true
              echo -e "  ${INFO} FTL:\\t\\t${COL_YELLOW}update available${COL_NC}"
          else
              case $? in
                  1)
                      echo -e "  ${INFO} FTL:\\t\\t${COL_LIGHT_GREEN}up to date${COL_NC}"
                      ;;
                  2)
                      echo -e "  ${INFO} FTL:\\t\\t${COL_LIGHT_RED}Branch is not available.${COL_NC}\\n\\t\\t\\tUse ${COL_LIGHT_GREEN}pihole checkout ftl [branchname]${COL_NC} to switch to a valid branch."
                      ;;

That needs to change to:

local funcOutput
funcOutput=$(get_binary_name) #Store output of get_binary_name here
local binary
binary="pihole-FTL${funcOutput##*pihole-FTL}" #binary name will be the last line of the output of get_binary_name (it always begins with pihole-FTL)

if FTLcheckUpdate "${binary}" > /dev/null; then

Binary isn't getting set because binary isn't being passed into FTLcheckUpdate as it would in a normal install run. This is already being done in release/v/5.0, we just missed it when cherry picking into release/v4.3.3

https://github.com/pi-hole/pi-hole/blob/release/v5.0/advanced/Scripts/update.sh#L131-L136