Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/pi-hole/pi-hole.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gravity.sh')
-rwxr-xr-xgravity.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/gravity.sh b/gravity.sh
index 9c11fa98..c5e9e414 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -527,8 +527,9 @@ parseList() {
# This sed does the following things:
# 1. Remove all domains containing invalid characters. Valid are: a-z, A-Z, 0-9, dot (.), minus (-), underscore (_)
# 2. Append ,adlistID to every line
- # 3. Ensures there is a newline on the last line
- sed -e "/[^a-zA-Z0-9.\_-]/d;s/$/,${adlistID}/;/.$/a\\" "${src}" >> "${target}"
+ # 3. Remove trailing period (see https://github.com/pi-hole/pi-hole/issues/4701)
+ # 4. Ensures there is a newline on the last line
+ sed -e "/[^a-zA-Z0-9.\_-]/d;s/\.$//;s/$/,${adlistID}/;/.$/a\\" "${src}" >> "${target}"
# Find (up to) five domains containing invalid characters (see above)
incorrect_lines="$(sed -e "/[^a-zA-Z0-9.\_-]/!d" "${src}" | head -n 5)"