Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-02-27 05:28:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove CIDR from IPs

Browse source
This commit is contained in:
Tommy Huff 2016-10-19 14:49:03 -04:00
parent 67f553a7f2
commit b2134b8fde
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
advanced/Scripts/blacklist.sh
View file

@ -97,10 +97,10 @@ ModifyHostFile(){
echo ":::"
echo -n "::: Modifying HOSTS file to blacklist $numberOf domain${plural}..."
if [[ -n "${IPv6_address}" ]] ; then
sed "s/^/${IPv6_address} /g" ${blacklist} >> ${adList}
sed "s/^/$IPv6_address /g" ${blacklist} >> ${adList}
fi
if [[ -n "${IPv4_address}" ]] ; then
sed "s/^/${IPv4_address} /g" ${blacklist} >> ${adList}
sed "s/^/$IPv4_address /g" ${blacklist} >> ${adList}
fi
fi
else
@ -198,11 +198,10 @@ else
fi
if [[ -n "${IPv6_address}" ]] ; then
piholeIP=${IPv6_address}
piholeIP=$(echo "${piholeIP}" | cut -f1 -d"/")
else
piholeIP=${IPv4_address}
piholeIP=$(echo "${piholeIP}" | cut -f1 -d"/")
IPv6_address=$(echo "${IPv6_address}" | cut -f1 -d"/")
fi
if [[ -n "${IPv6_address}" ]] ; then
IPv4_address=$(echo "${IPv4_address}" | cut -f1 -d"/")
fi

10
advanced/Scripts/whitelist.sh
View file

@ -209,12 +209,12 @@ else
exit 1
fi
#remove CIDR from IPs
if [[ -n "${IPv6_address}" ]] ; then
piholeIP=${IPv6_address}
piholeIP=$(echo "${piholeIP}" | cut -f1 -d"/")
else
piholeIP=${IPv4_address}
piholeIP=$(echo "${piholeIP}" | cut -f1 -d"/")
IPv6_address=$(echo "${IPv6_address}" | cut -f1 -d"/")
fi
if [[ -n "${IPv6_address}" ]] ; then
IPv4_address=$(echo "${IPv4_address}" | cut -f1 -d"/")
fi
PopWhitelistFile