From 466e6d9b3024fcf536f9ad536e29bc88d033cfe3 Mon Sep 17 00:00:00 2001 From: spacedingo Date: Tue, 26 Sep 2017 05:53:07 +0400 Subject: [PATCH 1/2] Redo pull #1687 Fix for case sensitive duplicate domains The change (https://github.com/pi-hole/pi-hole/pull/1687) was recently undone. --- gravity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravity.sh b/gravity.sh index bec843df..5954764c 100755 --- a/gravity.sh +++ b/gravity.sh @@ -367,7 +367,7 @@ gravity_Schwarzschild() { # Determine if file has read permissions, as download might have failed if [[ -r "${i}" ]]; then # Remove windows CRs from file, and append into $matterAndLight - tr -d '\r' < "${i}" >> "${piholeDir}/${matterAndLight}" + tr -d '\r' < "${i}" | tr '[:upper:]' '[:lower:]' >> "${piholeDir}/${matterAndLight}" # Ensure that the first line of a new list is on a new line lastLine=$(tail -1 "${piholeDir}/${matterAndLight}") From 60365ad36a84b3bc99cdca8f0d5c5350842608a7 Mon Sep 17 00:00:00 2001 From: spacedingo Date: Tue, 26 Sep 2017 09:25:47 +0400 Subject: [PATCH 2/2] Update gravity.sh --- gravity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravity.sh b/gravity.sh index 5954764c..8719885c 100755 --- a/gravity.sh +++ b/gravity.sh @@ -366,7 +366,7 @@ gravity_Schwarzschild() { for i in "${activeDomains[@]}"; do # Determine if file has read permissions, as download might have failed if [[ -r "${i}" ]]; then - # Remove windows CRs from file, and append into $matterAndLight + # Remove windows CRs from file, convert list to lower case, and append into $matterAndLight tr -d '\r' < "${i}" | tr '[:upper:]' '[:lower:]' >> "${piholeDir}/${matterAndLight}" # Ensure that the first line of a new list is on a new line