Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-03-02 23:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Finish up shellcheck and catch the final exit.

Browse source
This commit is contained in:
Dan Schaper 2016-11-16 22:23:33 -08:00
parent f213c16019
commit e1382317b1
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
advanced/Scripts/piholeDebug.sh
View file

@ -401,7 +401,9 @@ finalWork() {
esac esac
if [[ "${tricorder}" ]]; then if [[ "${tricorder}" ]]; then
echo "::: Your debug token is : ${tricorder}" echo ":::"
log_echo "::: Your debug token is : ${tricorder}"
echo ":::"
echo "::: Please contact the Pi-hole team with your token for assistance." echo "::: Please contact the Pi-hole team with your token for assistance."
echo "::: Thank you." echo "::: Thank you."
else else
@ -414,7 +416,16 @@ finalWork() {
echo "::: A local copy of the Debug log can be found at : /var/log/pihole_debug.log" echo "::: A local copy of the Debug log can be found at : /var/log/pihole_debug.log"
} }
count_gravity() {
header_write "Analyzing gravity.list"
gravity_length=$(wc -l "${GRAVITYFILE}")
if [[ "${gravity_length}" ]]; then
log_write "${GRAVITYFILE} is ${gravity_length} lines long."
else
log_echo "Warning: No gravity.list file found!"
fi
}
### END FUNCTIONS ### ### END FUNCTIONS ###
# Gather version of required packages / repositories # Gather version of required packages / repositories
@ -440,13 +451,7 @@ files_check "${WHITELISTFILE}"
files_check "${BLACKLISTFILE}" files_check "${BLACKLISTFILE}"
files_check "${ADLISTFILE}" files_check "${ADLISTFILE}"
count_gravity
header_write "Analyzing gravity.list"
gravity_length=$(wc -l "${GRAVITYFILE}") \
&& log_write "${GRAVITYFILE} is ${gravity_length} lines long." \
|| log_echo "Warning: No gravity.list file found!"
dumpPiHoleLog dumpPiHoleLog
trap finalWork EXIT trap finalWork EXIT