From 0de5132e2b2afef6e6fa1c573a9060c79d73d940 Mon Sep 17 00:00:00 2001
From: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
Date: Fri, 18 Jan 2019 22:14:34 +0100
Subject: [PATCH 1/4] Solves RegEx issue.

Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
---
 gravity.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 75a51608..3247a8e2 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -338,11 +338,11 @@ gravity_ParseFileIntoDomains() {
     # Awk -F splits on given IFS, we grab the right hand side (chops trailing #coments and /'s to grab the domain only.
     # Last awk command takes non-commented lines and if they have 2 fields, take the right field (the domain) and leave
     # the left (IP address), otherwise grab the single field.
-
-    < ${source} awk -F '#' '{print $1}' | \
-    awk -F '/' '{print $1}' | \
-    awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' | \
-    sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  ${destination}
+    < ${source} tr -d '\r' | \
+    tr '[:upper:]' '[:lower:]' | \
+    sed -r '/(\/|#).*$/d' | \
+    sed -r 's/^.*\s+//g' | \
+    sed -r '/([^\.]+\.)+[^\.]{2,}/!d' >  ${destination}
     return 0
   fi
 

From e02da90faae124a9df3847b255f2116c126d26c7 Mon Sep 17 00:00:00 2001
From: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
Date: Sat, 19 Jan 2019 17:48:29 +0100
Subject: [PATCH 2/4] Replaces double quotes by single quotes and updates
 documentation.

Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
---
 gravity.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 3247a8e2..7b9116a4 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -335,14 +335,16 @@ gravity_ParseFileIntoDomains() {
     # 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
     # It also helps with debugging so each stage of the script can be researched more in depth
-    # Awk -F splits on given IFS, we grab the right hand side (chops trailing #coments and /'s to grab the domain only.
-    # Last awk command takes non-commented lines and if they have 2 fields, take the right field (the domain) and leave
-    # the left (IP address), otherwise grab the single field.
-    < ${source} tr -d '\r' | \
-    tr '[:upper:]' '[:lower:]' | \
-    sed -r '/(\/|#).*$/d' | \
-    sed -r 's/^.*\s+//g' | \
-    sed -r '/([^\.]+\.)+[^\.]{2,}/!d' >  ${destination}
+    # 1) Remove carriage returns
+    # 2) Convert all characters to lowercase
+    # 3) Remove lines containing "#" or "/"
+    # 4) Remove leading tabs, spaces, etc.
+    # 5) Delete lines not matching domain names
+    < ${source} tr -d "\r" | \
+    tr "[:upper:]" "[:lower:]" | \
+    sed -r "/(\/|#).*$/d" | \
+    sed -r "s/^.*\s+//g" | \
+    sed -r "/([^\.]+\.)+[^\.]{2,}/!d" >  ${destination}
     return 0
   fi
 

From cd8a423b32cd3900861085f9f64affc14cb544f2 Mon Sep 17 00:00:00 2001
From: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
Date: Sun, 20 Jan 2019 16:04:07 +0100
Subject: [PATCH 3/4] Solves RegEx issue and updates documentation.

Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
---
 gravity.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 7b9116a4..6fe9be06 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -340,11 +340,11 @@ gravity_ParseFileIntoDomains() {
     # 3) Remove lines containing "#" or "/"
     # 4) Remove leading tabs, spaces, etc.
     # 5) Delete lines not matching domain names
-    < ${source} tr -d "\r" | \
-    tr "[:upper:]" "[:lower:]" | \
-    sed -r "/(\/|#).*$/d" | \
-    sed -r "s/^.*\s+//g" | \
-    sed -r "/([^\.]+\.)+[^\.]{2,}/!d" >  ${destination}
+    < ${source} tr -d '\r' | \
+    tr '[:upper:]' '[:lower:]' | \
+    sed -r '/(\/|#).*$/d' | \
+    sed -r 's/^.*\s+//g' | \
+    sed -r '/([^\.]+\.)+[^\.]{2,}/!d' >  ${destination}
     return 0
   fi
 

From 54ae9d83b0a4ff09c2a40db079df9952cfd122af Mon Sep 17 00:00:00 2001
From: Dan Schaper <dan.schaper@pi-hole.net>
Date: Sat, 23 Feb 2019 13:42:15 -0800
Subject: [PATCH 4/4] Stickler-lints

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
---
 gravity.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 6fe9be06..015764ac 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -340,11 +340,11 @@ gravity_ParseFileIntoDomains() {
     # 3) Remove lines containing "#" or "/"
     # 4) Remove leading tabs, spaces, etc.
     # 5) Delete lines not matching domain names
-    < ${source} tr -d '\r' | \
+    < "${source}" tr -d '\r' | \
     tr '[:upper:]' '[:lower:]' | \
     sed -r '/(\/|#).*$/d' | \
     sed -r 's/^.*\s+//g' | \
-    sed -r '/([^\.]+\.)+[^\.]{2,}/!d' >  ${destination}
+    sed -r '/([^\.]+\.)+[^\.]{2,}/!d' >  "${destination}"
     return 0
   fi