Removed
Link Here
|
1 |
--- void-zones-update.sh.orig 2017-08-22 12:36:14 UTC |
2 |
+++ void-zones-update.sh |
3 |
@@ -47,6 +47,8 @@ fi |
4 |
ZONES_DIR="/usr/local/etc/void-zones" |
5 |
if [ ! -d "$ZONES_DIR" ]; then |
6 |
mkdir -p "$ZONES_DIR" |
7 |
+fi |
8 |
+if [ ! -f "$ZONES_DIR/my_void_hosts.txt" ]; then |
9 |
echo "# white list" > "$ZONES_DIR/my_void_hosts.txt" |
10 |
echo "1.1.1.1 my.white.dom" >> "$ZONES_DIR/my_void_hosts.txt" |
11 |
echo "" >> "$ZONES_DIR/my_void_hosts.txt" |
12 |
@@ -63,9 +65,8 @@ $FETCH -o "$ZONES_DIR/mdl_void_hosts.txt |
13 |
$FETCH -o "$ZONES_DIR/away_void_hosts.txt" "https://adaway.org/hosts.txt" |
14 |
$FETCH -o "$ZONES_DIR/jdom_void_list.txt" "http://mirror1.malwaredomains.com/files/justdomains" |
15 |
$FETCH -o "$ZONES_DIR/ucky_void_host.txt" "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts" |
16 |
-$FETCH -o "$ZONES_DIR/w10telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win10/spy.txt" |
17 |
-$FETCH -o "$ZONES_DIR/w81telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win81/spy.txt" |
18 |
-$FETCH -o "$ZONES_DIR/w7telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win7/spy.txt" |
19 |
+$FETCH -o "$ZONES_DIR/wintelm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt" |
20 |
+ |
21 |
|
22 |
if [ ! -f "$ZONES_DIR/pgl_void_hosts.txt" ] ; then |
23 |
echo "# No hosts from pgl." > "$ZONES_DIR/pgl_void_hosts.txt" |
24 |
@@ -95,17 +96,10 @@ if [ ! -f "$ZONES_DIR/ucky_void_host.txt |
25 |
echo "# No hosts from FadeMind/unchecky." > "$ZONES_DIR/ucky_void_host.txt" |
26 |
fi |
27 |
|
28 |
-if [ ! -f "$ZONES_DIR/w10telm_void_hosts.txt" ] ; then |
29 |
- echo "# No hosts from WindowsSpyBlocker/win10/spy." > "$ZONES_DIR/w10telm_void_hosts.txt" |
30 |
-fi |
31 |
- |
32 |
-if [ ! -f "$ZONES_DIR/w81telm_void_hosts.txt" ] ; then |
33 |
- echo "# No hosts from WindowsSpyBlocker/win81/spy." > "$ZONES_DIR/w81telm_void_hosts.txt" |
34 |
+if [ ! -f "$ZONES_DIR/wintelm_void_hosts.txt" ] ; then |
35 |
+ echo "# No hosts from WindowsSpyBlocker/hosts/spy." > "$ZONES_DIR/wintelm_void_hosts.txt" |
36 |
fi |
37 |
|
38 |
-if [ ! -f "$ZONES_DIR/w7telm_void_hosts.txt" ] ; then |
39 |
- echo "# No hosts from WindowsSpyBlocker/win7/spy." > "$ZONES_DIR/w7telm_void_hosts.txt" |
40 |
-fi |
41 |
|
42 |
/usr/local/bin/hosts2zones /tmp/local-void.zones \ |
43 |
"$ZONES_DIR/my_void_hosts.txt" \ |
44 |
@@ -116,9 +110,7 @@ fi |
45 |
"$ZONES_DIR/away_void_hosts.txt" \ |
46 |
"$ZONES_DIR/jdom_void_list.txt" \ |
47 |
"$ZONES_DIR/ucky_void_host.txt" \ |
48 |
- "$ZONES_DIR/w10telm_void_hosts.txt" \ |
49 |
- "$ZONES_DIR/w81telm_void_hosts.txt" \ |
50 |
- "$ZONES_DIR/w7telm_void_hosts.txt" \ |
51 |
+ "$ZONES_DIR/wintelm_void_hosts.txt" \ |
52 |
"$ZONES_DIR/x_void_list.txt" \ |
53 |
"$ZONES_DIR/y_void_list.txt" \ |
54 |
"$ZONES_DIR/z_void_list.txt" \ |
55 |
- |