Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1708 from pi-hole/fix/gravityErrors

Browse source 
Place errors on newline
This commit is contained in:
WaLLy3K 2017-09-25 15:39:26 +10:00 committed by GitHub
commit 11d48554e3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gravity.sh
View file

@ -345,7 +345,7 @@ gravity_ParseFileIntoDomains() {
output=$( { mv "${source}" "${destination}"; } 2>&1 ) output=$( { mv "${source}" "${destination}"; } 2>&1 )
if [[ ! -e "${destination}" ]]; then if [[ ! -e "${destination}" ]]; then
echo -e " ${CROSS} Unable to move tmp file to ${piholeDir} echo -e "\\n ${CROSS} Unable to move tmp file to ${piholeDir}
${output}" ${output}"
gravity_Cleanup "error" gravity_Cleanup "error"
fi fi
@ -521,7 +521,7 @@ gravity_ParseBlacklistDomains() {
status="$?" status="$?"
if [[ "${status}" -ne 0 ]]; then if [[ "${status}" -ne 0 ]]; then
echo -e " ${CROSS} Unable to move ${accretionDisc} from ${piholeDir}\\n ${output}" echo -e "\\n ${CROSS} Unable to move ${accretionDisc} from ${piholeDir}\\n ${output}"
gravity_Cleanup "error" gravity_Cleanup "error"
fi fi
} }
@ -535,7 +535,7 @@ gravity_ParseUserDomains() {
gravity_ParseDomainsIntoHosts "${blacklistFile}" "${blackList}.tmp" gravity_ParseDomainsIntoHosts "${blacklistFile}" "${blackList}.tmp"
# 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
mv "${blackList}.tmp" "${blackList}" 2> /dev/null || \ mv "${blackList}.tmp" "${blackList}" 2> /dev/null || \
echo -e " ${CROSS} Unable to move ${blackList##*/}.tmp to ${piholeDir}" echo -e "\\n ${CROSS} Unable to move ${blackList##*/}.tmp to ${piholeDir}"
} }
# Trap Ctrl-C # Trap Ctrl-C