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-25 14:20:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve displayed messages and overall logic

Browse source
This commit is contained in:
DL6ER 2017-06-17 14:24:30 +02:00
parent 92e691408f
commit 8bad56e897
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gravity.sh
View file

@ -236,9 +236,7 @@ gravity_Blacklist() {
if [[ -f "${blacklistFile}" ]]; then if [[ -f "${blacklistFile}" ]]; then
numBlacklisted=$(wc -l < "${blacklistFile}") numBlacklisted=$(wc -l < "${blacklistFile}")
plural=; [[ "$numBlacklisted" != "1" ]] && plural=s plural=; [[ "$numBlacklisted" != "1" ]] && plural=s
echo -n "::: Blacklisting $numBlacklisted domain${plural}..." echo "::: Exact blocked domain${plural}: $numBlacklisted"
cat "${blacklistFile}" > "${blackList}.tmp"
echo " done!"
else else
echo "::: Nothing to blacklist!" echo "::: Nothing to blacklist!"
fi fi
@ -345,12 +343,16 @@ gravity_hostFormatGravity() {
} }
gravity_hostFormatBlack() { gravity_hostFormatBlack() {
if [[ -f "${blacklistFile}" ]]; then
numBlacklisted=$(wc -l < "${blacklistFile}")
# Format domain list as "192.168.x.x domain.com" # Format domain list as "192.168.x.x domain.com"
echo -e "" > "${blackList}.tmp" gravity_doHostFormat "${blacklistFile}" "${blackList}.tmp"
gravity_doHostFormat "${blackList}.tmp" "${blackList}"
# Copy the file over as /etc/pihole/black.list so dnsmasq can use it # Copy the file over as /etc/pihole/black.list so dnsmasq can use it
cp "${blackList}.tmp" "${blackList}" cp "${blackList}.tmp" "${blackList}"
rm "${blackList}.tmp" rm "${blackList}.tmp"
else
echo "::: Nothing to blacklist!"
fi
} }
# blackbody - remove any remnant files from script processes # blackbody - remove any remnant files from script processes