diff options
| author | Jacob van der Kolk | 2017-08-03 11:17:45 -0400 |
|---|---|---|
| committer | Jacob van der Kolk | 2017-08-03 11:17:45 -0400 |
| commit | 879f60fd802d9aa8381558b36e068868a395a5e0 (patch) | |
| tree | 7b54873df18cace176f6c3b428f52d53a5e6fdc0 /hostsblock.sh | |
| parent | ddc82f30345dede90a3a6d79613bfda9859a57d0 (diff) | |
| download | aur-879f60fd802d9aa8381558b36e068868a395a5e0.tar.gz | |
Version 0.999.6-1 (Alpha 6)
Diffstat (limited to 'hostsblock.sh')
| -rwxr-xr-x | hostsblock.sh | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/hostsblock.sh b/hostsblock.sh index 721355bee508..5c64f93f5e73 100755 --- a/hostsblock.sh +++ b/hostsblock.sh @@ -98,16 +98,16 @@ _check_url() { echo "Unblocking just $@" echo " $@" >> "$whitelist" _strip_entries " $@ \!" "$annotate" - _strip_entries " $@$" "$blacklist" - _strip_entries " $@$" "$hostsfile" + sed -i "/ $@$/d" "$blacklist" + sed -i "/ $@$/d" "$hostsfile" [ ! -d "$tmpdir"/hostsblock ] && mkdir $_v -p "$tmpdir"/hostsblock touch "$tmpdir"/hostsblock/changed elif [[ $b == 2 || "$b" == "2" ]]; then echo "Unblocking all sites containing url $@" echo "$@" >> "$whitelist" _strip_entries "$@" "$annotate" - _strip_entries "$@" "$blacklist" - _strip_entries "$@" "$hostsfile" + sed -i "/$@/d" "$blacklist" + sed -i "/$@/d" "$hostsfile" [ ! -d "$tmpdir"/hostsblock ] && mkdir $_v -p "$tmpdir"/hostsblock touch "$tmpdir"/hostsblock/changed fi @@ -129,7 +129,7 @@ _check_url() { fi rm -f "$_v" -- "$tmpdir"/hostsblock/"${annotate##*/}".tmp ) & - _strip_entries "^$@$" "$whitelist" & + sed -i "/^$@$/d" "$whitelist" & echo "$redirecturl $@" >> "$hostsfile" & [ ! -d "$tmpdir"/hostsblock ] && mkdir $_v -p "$tmpdir"/hostsblock touch "$tmpdir"/hostsblock/changed @@ -149,7 +149,7 @@ _check_url() { fi rm -f "$_v" -- "$tmpdir"/hostsblock/"${annotate##*/}".tmp ) & - _strip_entries "$@" "$whitelist" & + sed -i "/$@/d" "$whitelist" & echo "$redirecturl $@" >> "$hostsfile" & [ ! -d "$tmpdir"/hostsblock ] && mkdir $_v -p "$tmpdir"/hostsblock touch "$tmpdir"/hostsblock/changed @@ -290,6 +290,23 @@ if [ $_check -eq 1 ] || [ "${0##*/}" == "hostsblock-urlcheck" ]; then postprocess &>/dev/null fi fi + read -p "Page domain verified. Scan the whole page for other domains for (un)blocking? [y/N] " a + if [[ $a == "y" || $a == "Y" ]]; then + for LINE in $(curl -L --location-trusted -s "$_URL" | tr ' ' '\n' | grep "https*:\/\/" | sed -e "s/.*https*:\/\/\(.*\)$/\1/g" \ + -e "s/\//\n/g" | grep "\." | grep -vFe '"' -e ")" -e "(" -e "&" -e "?" -e "<" -e ">" -e "'" -e "_" | \ + grep -Fv -e "\.php$" -e "\.html*$" | grep "[a-z]$" | sort -u | tr "\n" " "); do + _check_url "$LINE" + done + _notify 1 "Whole-page scan completed." + fi + + if [ -f "$tmpdir"/hostsblock/changed ]; then + if [ $_verbosity -ge 1 ]; then + postprocess + else + postprocess &>/dev/null + fi + fi else # NORMAL PROCESS # CHECK FOR OPTIONAL DECOMPRESSION DEPENDENCIES |