Switch to new branch name for FTL v6 development

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
pull/5319/head
Adam Warner 12 months ago
parent 0fa5c62450
commit ca66c1ea9c
No known key found for this signature in database

@ -82,7 +82,7 @@ def test_installPihole_fresh_install_readableFiles(host):
# Workaround to get FTLv6 installed until it reaches master branch # Workaround to get FTLv6 installed until it reaches master branch
host.run( host.run(
""" """
echo "new/http" > /etc/pihole/ftlbranch echo "development-v6" > /etc/pihole/ftlbranch
""" """
) )
install = host.run( install = host.run(

@ -137,7 +137,7 @@ def test_getFTLConfigValue_getFTLConfigValue(host):
source /opt/pihole/basic-install.sh source /opt/pihole/basic-install.sh
create_pihole_user create_pihole_user
funcOutput=$(get_binary_name) funcOutput=$(get_binary_name)
echo "new/http" > /etc/pihole/ftlbranch echo "development-v6" > /etc/pihole/ftlbranch
binary="pihole-FTL${funcOutput##*pihole-FTL}" binary="pihole-FTL${funcOutput##*pihole-FTL}"
theRest="${funcOutput%pihole-FTL*}" theRest="${funcOutput%pihole-FTL*}"
FTLdetect "${binary}" "${theRest}" FTLdetect "${binary}" "${theRest}"

Loading…
Cancel
Save