Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-24 13:50:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Add helptext for pihole checkout ftl

Browse source 
* Only attempt to install FTL if branch was found
* ~~corebranches~~ webbranches (web branches now actually listed)

Signed-off-by: Adam Warner <adamw@rner.email>
This commit is contained in:
Adam Warner 2017-07-16 13:22:59 +01:00
parent 783f50657b
commit f2e9d585f7
No known key found for this signature in database
GPG key ID: 03843F6C65554B22
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
advanced/Scripts/piholeCheckout.sh
View file

@ -303,12 +303,12 @@ checkout() {
fi fi
webbranches=($(get_available_branches "${webInterfaceDir}")) webbranches=($(get_available_branches "${webInterfaceDir}"))
if [[ "${corebranches[@]}" == *"master"* ]]; then if [[ "${webbranches[@]}" == *"master"* ]]; then
echo -e "${OVER} ${TICK} $str echo -e "${OVER} ${TICK} $str
${INFO} ${#webbranches[@]} branches available for Web Admin" ${INFO} ${#webbranches[@]} branches available for Web Admin"
else else
# Print STDERR output from get_available_branches # Print STDERR output from get_available_branches
echo -e "${OVER} ${CROSS} $str\n\n${corebranches[*]}" echo -e "${OVER} ${CROSS} $str\n\n${webbranches[*]}"
exit 1 exit 1
fi fi
@ -329,12 +329,11 @@ checkout() {
if check_download_exists "$path"; then if check_download_exists "$path"; then
echo " ${TICK} Branch ${2} exists" echo " ${TICK} Branch ${2} exists"
FTLinstall "${binary}" "${path}"
else else
echo " ${CROSS} Requested branch \"${2}\" is not available" echo " ${CROSS} Requested branch \"${2}\" is not available"
fi fi
FTLinstall "${binary}" "${path}"
else else
echo -e " ${INFO} Requested option \"${1}\" is not available" echo -e " ${INFO} Requested option \"${1}\" is not available"
exit 1 exit 1

7
pihole
View file

@ -429,15 +429,15 @@ Time:
# Enable Pi-hole # Enable Pi-hole
echo -e " ${INFO} Enabling blocking" echo -e " ${INFO} Enabling blocking"
local str="Pi-hole Enabled" local str="Pi-hole Enabled"
sed -i 's/^#addn-hosts/addn-hosts/' /etc/dnsmasq.d/01-pihole.conf sed -i 's/^#addn-hosts/addn-hosts/' /etc/dnsmasq.d/01-pihole.conf
if [[ -e "/etc/pihole/wildcard.list" ]]; then if [[ -e "/etc/pihole/wildcard.list" ]]; then
mv "/etc/pihole/wildcard.list" "$wildcardlist" mv "/etc/pihole/wildcard.list" "$wildcardlist"
fi fi
fi fi
restartDNS restartDNS
echo -e "${OVER} ${TICK} ${str}" echo -e "${OVER} ${TICK} ${str}"
} }
@ -535,6 +535,7 @@ Switch Pi-hole subsystems to a different Github branch
Repositories: Repositories:
core [branch] Change the branch of Pi-hole's core subsystem core [branch] Change the branch of Pi-hole's core subsystem
web [branch] Change the branch of Admin Console subsystem web [branch] Change the branch of Admin Console subsystem
ftl [branch] Change the branch of Pi-hole's FTL subsystem
Branches: Branches:
master Update subsystems to the latest stable release master Update subsystems to the latest stable release