moparisthebest/pi-hole
1
0
Fork 0
mirror of https://github.com/moparisthebest/pi-hole synced 2024-11-11 11:55:01 -05:00
Code Issues Releases Wiki Activity

Appending ".$justDomainsExtension" to $saveLocation variable.

Browse Source 
Every use of $saveLocation was adding this and making lines
longer.
This commit is contained in:
korhadris 2015-08-22 16:04:54 -07:00
parent 159b29b80b
commit 0ec6eab683
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gravity.sh
View File

@ -51,15 +51,15 @@ do
domain=$(echo "${sources[$i]}" | cut -d'/' -f3) domain=$(echo "${sources[$i]}" | cut -d'/' -f3)
# Save the file as list.#.domain # Save the file as list.#.domain
saveLocation=$origin/"list"."$i"."$domain" saveLocation=$origin/list.$i.$domain.$justDomainsExtension
# Use a case statement to download lists that need special cURL commands to complete properly # Use a case statement to download lists that need special cURL commands to complete properly
case "$domain" in case "$domain" in
"adblock.mahakala.is") data=$(curl -s -A 'Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0' -e http://forum.xda-developers.com/ -z $saveLocation."$justDomainsExtension" "${sources[$i]}");; "adblock.mahakala.is") data=$(curl -s -A 'Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0' -e http://forum.xda-developers.com/ -z $saveLocation "${sources[$i]}");;
"pgl.yoyo.org") data=$(curl -s -d mimetype=plaintext -d hostformat=hosts -z $saveLocation."$justDomainsExtension" "${sources[$i]}");; "pgl.yoyo.org") data=$(curl -s -d mimetype=plaintext -d hostformat=hosts -z $saveLocation "${sources[$i]}");;
*) data=$(curl -s -z $saveLocation."$justDomainsExtension" -A "Mozilla/10.0" "${sources[$i]}");; *) data=$(curl -s -z $saveLocation -A "Mozilla/10.0" "${sources[$i]}");;
esac esac
if [[ -n "$data" ]];then if [[ -n "$data" ]];then
@ -68,7 +68,7 @@ do
# Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious # Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious
# This helps with that and makes it easier to read # This helps with that and makes it easier to read
# It also helps with debugging so each stage of the script can be researched more in depth # It also helps with debugging so each stage of the script can be researched more in depth
echo "$data" | awk 'NF {if ($1 !~ "#") { if (NF>1) {print $2} else {print $1}}}' > $saveLocation."$justDomainsExtension" echo "$data" | awk 'NF {if ($1 !~ "#") { if (NF>1) {print $2} else {print $1}}}' > $saveLocation
else else
echo "Skipping $domain list because it does not have any new entries..." echo "Skipping $domain list because it does not have any new entries..."
fi fi