From 065bc114e63436d0e534142a5d02282448c724dc Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 13 Sep 2016 17:03:04 +0200 Subject: [PATCH 1/2] improve make-trivial-rule duplicate heuristic add comment block for nonfunctional hosts --- src/chrome/content/rules/make-trivial-rule | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/chrome/content/rules/make-trivial-rule b/src/chrome/content/rules/make-trivial-rule index 2d6080ff51ae..0c6072be6ade 100755 --- a/src/chrome/content/rules/make-trivial-rule +++ b/src/chrome/content/rules/make-trivial-rule @@ -34,6 +34,15 @@ fi lower=$(echo "$1" | tr A-Z a-z) escaped=$(echo "$lower" | sed 's/\./\\./g' ) + +duplicate=$(grep -EHin '' *.xml) +if [ -n "$duplicate" ] +then + echo "error: $lower already exists:" >&2 + echo "$duplicate" >&2 + exit 1 +fi + if [ "$#" -gt 1 ] ; then to="$2" else @@ -41,6 +50,15 @@ else fi cat > "$dest" < From 90cfff4d6ef1cfc7f3cf316ea02c424759a51d9b Mon Sep 17 00:00:00 2001 From: jowi Date: Sat, 1 Oct 2016 20:35:59 +0200 Subject: [PATCH 2/2] avoid unicode chars in comments --- src/chrome/content/rules/make-trivial-rule | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/make-trivial-rule b/src/chrome/content/rules/make-trivial-rule index 0c6072be6ade..2e22d6ac2fad 100755 --- a/src/chrome/content/rules/make-trivial-rule +++ b/src/chrome/content/rules/make-trivial-rule @@ -53,11 +53,11 @@ cat > "$dest" <