mirror of https://github.com/Zelo72/rpi
build auto-update
This commit is contained in:
parent
86c08d033d
commit
e4760e1b63
File diff suppressed because it is too large
Load Diff
|
@ -80,12 +80,16 @@ version=$(date +'%Y.%m%d.%H%M%S')
|
|||
|
||||
# Helpfunctions
|
||||
getDomainsFromList() {
|
||||
type=$5
|
||||
if [ -z "$5" ]; then
|
||||
type="0"
|
||||
fi
|
||||
if [ -s "$1" ]; then
|
||||
while IFS= read -r list || [ -n "$list" ]; do
|
||||
if [ "${list:0:1}" == "#" ] || [ "${list:0:1}" == "" ]; then
|
||||
continue
|
||||
fi
|
||||
extractValidDomains 0 "$list" >>"$2"
|
||||
extractValidDomains $type "$list" >>"$2"
|
||||
done <"$1"
|
||||
sortList "$2"
|
||||
|
||||
|
@ -295,13 +299,9 @@ convertWhiteToAdblock() {
|
|||
continue
|
||||
fi
|
||||
if [ "${domain:0:2}" == "*." ]; then
|
||||
echo "@@||$(echo "$domain" | sed 's/^\*\.//')^|" >>"$2"
|
||||
echo "@@||$(echo "$domain" | sed 's/^\*\.//')^" >>"$2"
|
||||
else
|
||||
if [[ $domain =~ \* ]]; then
|
||||
echo "@@/$domain/" >>"$2"
|
||||
else
|
||||
echo "@@|$domain^|" >>"$2"
|
||||
fi
|
||||
echo "@@|$domain^" >>"$2"
|
||||
fi
|
||||
done <"$1"
|
||||
fi
|
||||
|
@ -516,7 +516,7 @@ echo ""
|
|||
if [ -s "$white" ]; then
|
||||
cat <"$white" >>"$domains".whitelist
|
||||
fi
|
||||
getDomainsFromList "$whitelists" "$domains".whitelist 1 1
|
||||
getDomainsFromList "$whitelists" "$domains".whitelist 1 1 3
|
||||
|
||||
if [ -s "$domains".whitelist ]; then
|
||||
echo -n "-- White: "
|
||||
|
|
|
@ -32,43 +32,27 @@ sortList() {
|
|||
|
||||
convertWhiteToAdBlock() {
|
||||
rm -f "$2"
|
||||
includesubdomains=$3
|
||||
if [ -z "$3" ]; then
|
||||
includesubdomains="0"
|
||||
fi
|
||||
while IFS= read -r domain || [ -n "$domain" ]; do
|
||||
if [ "${domain:0:1}" == "#" ] || [ "${domain:0:1}" == "" ]; then
|
||||
echo "$domain" | sed 's/^\#/\!/' >>"$2"
|
||||
continue
|
||||
fi
|
||||
if [ "${domain:0:2}" == "*." ]; then
|
||||
echo "@@||$(echo "$domain" | sed 's/^\*\.//')^|" >>"$2"
|
||||
echo "@@||$(echo "$domain" | sed 's/^\*\.//')^" >>"$2"
|
||||
else
|
||||
if [[ $domain =~ \* ]]; then
|
||||
echo "@@/$domain/" >>"$2"
|
||||
if [ $includesubdomains == "0" ]; then
|
||||
echo "@@|$domain^" >>"$2"
|
||||
else
|
||||
echo "@@|$domain^|" >>"$2"
|
||||
echo "@@||$domain^" >>"$2"
|
||||
fi
|
||||
fi
|
||||
done <"$1"
|
||||
}
|
||||
|
||||
convertWhiteToAdBlockSubdomains() {
|
||||
rm -f "$2"
|
||||
while IFS= read -r domain || [ -n "$domain" ]; do
|
||||
if [ "${domain:0:1}" == "#" ] || [ "${domain:0:1}" == "" ]; then
|
||||
echo "$domain" | sed 's/^\#/\!/' >>"$2"
|
||||
continue
|
||||
fi
|
||||
if [ "${domain:0:2}" == "*." ]; then
|
||||
echo "@@||$(echo "$domain" | sed 's/^\*\.//')^|" >>"$2"
|
||||
else
|
||||
if [[ $domain =~ \* ]]; then
|
||||
echo "@@/$domain/" >>"$2"
|
||||
else
|
||||
echo "@@||$domain^|" >>"$2"
|
||||
fi
|
||||
fi
|
||||
done <"$1"
|
||||
sortList $2
|
||||
}
|
||||
|
||||
# Start
|
||||
echo '==========================================='
|
||||
echo 'Whitelist ...'
|
||||
|
@ -144,7 +128,7 @@ cp $data/white.list.referral /media/nas/git/hosts
|
|||
|
||||
# Convert personal whitelist to AdBlock format
|
||||
convertWhiteToAdBlock "$data/white.list" /media/nas/git/adguard/whitelist.adguard
|
||||
convertWhiteToAdBlockSubdomains "$data/white.list.referral" /media/nas/git/adguard/whitelist.referral.adguard
|
||||
convertWhiteToAdBlock "$data/white.list.referral" /media/nas/git/adguard/whitelist.referral.adguard 1
|
||||
|
||||
# Build host-compiler exclusion lists
|
||||
cat <"$data/white.list" | grep -Ev '^\s*$|^#|^!' | sed 's/\*\.//' | sort -u | sed -e 's/^/|/' | sed -e 's/$/^/' >"$data/adblock.exclusions.list"
|
||||
|
|
Loading…
Reference in New Issue