diff --git a/advanced/Scripts/piholeCheckout.sh b/advanced/Scripts/piholeCheckout.sh index 41fd8606..24ab7cd1 100755 --- a/advanced/Scripts/piholeCheckout.sh +++ b/advanced/Scripts/piholeCheckout.sh @@ -170,10 +170,23 @@ checkout() { echo " ${TICK} Branch ${2} exists" echo "${2}" > /etc/pihole/ftlbranch chmod 644 /etc/pihole/ftlbranch - echo -e " ${INFO} Switching to branch: \"${2}\" from \"${oldbranch}\"" + echo -e " ${INFO} Switching to branch \"${2}\" from \"${oldbranch}\"" FTLinstall "${binary}" restart_service pihole-FTL enable_service pihole-FTL + str="Restarting FTL..." + echo -ne " ${INFO} ${str}" + # Wait until name resolution is working again after restarting FTL, + # so that the updatechecker can run successfully and does not fail + # trying to resolve github.com + until getent hosts github.com &> /dev/null; do + # Append one dot for each second waiting + str="${str}." + echo -ne " ${OVER} ${INFO} ${str}" + sleep 1 + done + echo -e " ${OVER} ${TICK} Restarted FTL service" + # Update local and remote versions via updatechecker /opt/pihole/updatecheck.sh else