fix breakage:

  - add missing match for google.com
  - make window.rwt read-only to prevent the page overwriting it
  - build cleanup
  - improve documentation

Author: chocolateboy

.gitignore

@@ -0,0 +1,3 @@
+/build/
+/dev/
+/web-ext-artifacts/

COPYRIGHT

@@ -1,5 +1,5 @@
-Avoid Google Search redirects allows you to avoid tracking by Google
-Search on clients side.
+Avoid Google Search redirects prevents Google Search tracking you with redirect
+links.
 
 Copyright ⓒ 2017 Adrien Dorsaz <[email protected]>
 

Makefile

@@ -1,36 +1,19 @@
-# This file is part of Avoid Google Search redirects.
-#
-# Copyright ⓒ 2017 Adrien Dorsaz <[email protected]>
-#
-# Avoid Google Search redirects is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Avoid Google Search redirects is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Avoid Google Search redirects.If not, see <http://www.gnu.org/licenses/>.
+IGNORE := build dev Makefile
 
-PERCENT := %
+build: script.js
+	web-ext build --overwrite-dest --ignore-files $(IGNORE)
 
-build:
-	zip ../avoid-google-search-redirects.zip -FS -r *
+clean:
+	rm -rf ./web-ext
 
-# Look only for country related root TLD
-# Suppose that the iana URL give one line by domain with something like <span class="domain tld"><a>.root</a>
-get-google-urls:
-	curl --silent 'https://www.iana.org/domains/root/db' | \
-		grep 'country-code' -B2 | \
-		grep 'class="domain tld"' | grep '>\.\w*<\/a>' -o | sed  's/<\/a>//' | sed 's/>//' | \
-		xargs -I '{}' /bin/bash -c "if openssl s_client -showcerts --servername www.google{} --connect www.google{}:443 </dev/null 2>&1 | grep --quiet 'depth=0 C = US, ST = California, L = Mountain View, O = Google Inc'; then curl -Ls -o /dev/null -w '$(PERCENT){url_effective}\r\n' -A 'Mozilla/5.0' 'https://www.google{}' >>extern/google.urls ; sleep 5 ; fi"
+rebuild: clean build
 
-get-google-matches:
-	# Exceptions are manually found by clicking on ever link in extern/google.urls
-	egrep -v "(ai.google|google.do|google.gd|google.io|google.kr|google.ph|google.sg|google.tw)" extern/google.urls |\
-		sed 's/^https\?/\\"*/' | sed 's/?.*$$//' | sed 's=/\s*$$=/*\\",=' | \
-		sort -u | \
-		xargs | sed 's/,\s*$$//' >extern/google.matches
+build-dir:
+	@mkdir -p build
+
+get-google-matches: build-dir
+	curl --silent 'https://www.google.com/supported_domains'                                          \
+		| jq --raw-input --slurp 'split("\n") | map(select(. != "")) | map("*://www" + . + "/*")' \
+		> ./build/google-matches.json
+
+.PHONY: build

README.md

@@ -1,21 +1,38 @@
 # Avoid Google Search redirects
 
-## Introduction
+[![Firefox Version](https://img.shields.io/amo/v/avoid-google-search-redirects.svg?style=popout&logo=mozilla%20firefox&colorB=green)](https://addons.mozilla.org/firefox/addon/avoid-google-search-redirects/)
 
-This add-on avoids Google Search to track you with redirect links.
+## Description
 
-When a user hovers a Google Search result, target link seems to be the right one, but, when he clicks on this link, the target is rewritten with a redirection link to a Google tracker.
-This tracker is then able to save your click in the Google Search engine data.
+This add-on prevents Google Search tracking you with redirect links. Rather
+than detecting and repairing the intercepted links, which can be complex and
+fragile, it disables the JavaScript function which Google uses to rewrite the
+links.
 
-To achieve this, Google Search uses an onmousedown event on results. This event is able to rewrite the target link by using a function called « rwt ».
-This add-on simply redefines this rwt function with an empty function, so nothing happens on click and user goes directly to its result.
+### Details
 
-The original idea comes from the « Remove Google Redirect in Google Search Results » add-on.
+When you hover over a Google Search result, the target link seems to be the
+right one but when you click on this link, the target is replaced with a link
+to a Google tracker, which is used to record the external links you visit.
 
-This add-on is packaged as WebExtension and so is compatible with recent Firefox releases and technologies.
+To achieve this, Google Search uses an `onmousedown` event on result links.
+This event rewrites the target link by using a function called `rwt`. This
+add-on simply replaces this `rwt` function with an empty function, so nothing
+happens on click and you go directly to the result.
 
-## Report issue, improvements
+The original idea comes from the
+[Remove Google Redirect in Google Results](https://chrome.google.com/webstore/detail/remove-google-redirect-in/miaghkkhkjklnijffegcpjlhdjelnkke)
+add-on.
 
-Source code can be found on Github: https://github.com/Trim/avoid-google-search-redirects
+This add-on is packaged as a WebExtension and so is compatible with Firefox 57+ (November 2017).
+
+## Report issues, improvements
+
+Source code can be found on GitHub: https://github.com/Trim/avoid-google-search-redirects
 
 You can use this repository to open issues and feature requests.
+
+## See Also
+
+- [google-redirect-rewrite-remove](https://addons.mozilla.org/en-US/firefox/addon/google-redirect-rewrite-remove/) - uses a similar technique to this add-on, but in a less robust way
+- [Remove Google Redirect in Google Results](https://chrome.google.com/webstore/detail/remove-google-redirect-in/miaghkkhkjklnijffegcpjlhdjelnkke) - the original inspiration for this add-on

_locales/en/messages.json

@@ -3,9 +3,9 @@
         "description": "Name of the extension.",
         "message": "Avoid Google Search redirects"
     },
-    
+
     "extensionDescription": {
         "description": "Description of the extension (less than 250 characters).",
-        "message": "This add-on avoids Google Search to track your clicks on result links.\r\nThis principle is to disable a JavaScript code sent by Google which rewrites target links."
+        "message": "This add-on prevents Google Search tracking you with redirect links."
     }
 }

_locales/fr/messages.json

@@ -3,9 +3,9 @@
         "description": "Name of the extension.",
         "message": "Eviter les redirections Google Search"
     },
-    
+
     "extensionDescription": {
         "description": "Description of the extension (less than 250 characters).",
-        "message": "Cette extension empêche Google Search de pister vos cliques sur les liens des résultas.\r\nLe principe est de désactiver un code JavaScript envoyé par Google qui réécrit la cible du lien."
+        "message": "Cette extension empêche Google Search de pister vos cliques sur les liens des résultas."
     }
 }