Incorporates changes requested by @Mcat12
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
This commit is contained in:
12
gravity.sh
12
gravity.sh
@@ -485,7 +485,7 @@ gravity_SortAndFilterConsolidatedList() {
|
||||
fi
|
||||
|
||||
sort -u "${piholeDir}/${parsedMatter}" > "${piholeDir}/${preEventHorizon}"
|
||||
chmod a+r "${piholeDir}/${preEventHorizon}"
|
||||
chmod 644 "${piholeDir}/${preEventHorizon}"
|
||||
|
||||
if [[ "${haveSourceUrls}" == true ]]; then
|
||||
echo -e "${OVER} ${TICK} ${str}"
|
||||
@@ -510,7 +510,7 @@ gravity_Whitelist() {
|
||||
|
||||
# Print everything from preEventHorizon into whitelistMatter EXCEPT domains in $whitelistFile
|
||||
comm -23 "${piholeDir}/${preEventHorizon}" <(sort "${whitelistFile}") > "${piholeDir}/${whitelistMatter}"
|
||||
chmod a+r "${piholeDir}/${whitelistMatter}"
|
||||
chmod 644 "${piholeDir}/${whitelistMatter}"
|
||||
|
||||
echo -e "${OVER} ${INFO} ${str}"
|
||||
}
|
||||
@@ -563,7 +563,7 @@ gravity_ParseLocalDomains() {
|
||||
|
||||
# Empty $localList if it already exists, otherwise, create it
|
||||
: > "${localList}"
|
||||
chmod a+r "${localList}"
|
||||
chmod 644 "${localList}"
|
||||
|
||||
gravity_ParseDomainsIntoHosts "${localList}.tmp" "${localList}"
|
||||
|
||||
@@ -586,7 +586,7 @@ gravity_ParseBlacklistDomains() {
|
||||
# There was no whitelist file, so use preEventHorizon instead of whitelistMatter.
|
||||
cp -p "${piholeDir}/${preEventHorizon}" "${piholeDir}/${accretionDisc}"
|
||||
fi
|
||||
chmod a+r "${piholeDir}/${accretionDisc}"
|
||||
chmod 644 "${piholeDir}/${accretionDisc}"
|
||||
|
||||
# Move the file over as /etc/pihole/gravity.list so dnsmasq can use it
|
||||
output=$( { mv "${piholeDir}/${accretionDisc}" "${adList}"; } 2>&1 )
|
||||
@@ -596,7 +596,7 @@ gravity_ParseBlacklistDomains() {
|
||||
echo -e "\\n ${CROSS} Unable to move ${accretionDisc} from ${piholeDir}\\n ${output}"
|
||||
gravity_Cleanup "error"
|
||||
fi
|
||||
chmod a+r "${adList}"
|
||||
chmod 644 "${adList}"
|
||||
}
|
||||
|
||||
# Create user-added blacklist entries
|
||||
@@ -607,7 +607,7 @@ gravity_ParseUserDomains() {
|
||||
# Copy the file over as /etc/pihole/black.list so dnsmasq can use it
|
||||
cp "${blacklistFile}" "${blackList}" 2> /dev/null || \
|
||||
echo -e "\\n ${CROSS} Unable to move ${blacklistFile##*/} to ${piholeDir}"
|
||||
chmod a+r "${blackList}"
|
||||
chmod 644 "${blackList}"
|
||||
}
|
||||
|
||||
# Trap Ctrl-C
|
||||
|
Reference in New Issue
Block a user