From 817100c10c938196fa9cbec3696784438d3172b3 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Sun, 16 Oct 2016 23:08:08 -0400 Subject: [PATCH] =?UTF-8?q?Issue=20#188:=20the=20makeHosts=20scripts=20now?= =?UTF-8?q?=20use=20the=20=E2=80=94zip=20flag=20to=20create=20sister=20.zi?= =?UTF-8?q?p=20files.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- makeHosts | 16 ++++++++-------- makeHostsWindows.bat | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/makeHosts b/makeHosts index d4c826925..8917c0b57 100755 --- a/makeHosts +++ b/makeHosts @@ -1,14 +1,14 @@ #!/bin/sh # These create various alternate hosts files by combining and adding the gambling, porn, and social media extensions. -python3 updateHostsFile.py -a -o alternates/gambling -e gambling -python3 updateHostsFile.py -a -n -o alternates/porn -e porn -python3 updateHostsFile.py -a -n -o alternates/social -e social -python3 updateHostsFile.py -a -n -o alternates/gambling-porn -e gambling porn -python3 updateHostsFile.py -a -n -o alternates/gambling-social -e gambling social -python3 updateHostsFile.py -a -n -o alternates/porn-social -e porn social -python3 updateHostsFile.py -a -n -o alternates/gambling-porn-social -e gambling porn social -python3 updateHostsFile.py -a -n +python3 updateHostsFile.py -a -z -o alternates/gambling -e gambling +python3 updateHostsFile.py -a -z -n -o alternates/porn -e porn +python3 updateHostsFile.py -a -z -n -o alternates/social -e social +python3 updateHostsFile.py -a -z -n -o alternates/gambling-porn -e gambling porn +python3 updateHostsFile.py -a -z -n -o alternates/gambling-social -e gambling social +python3 updateHostsFile.py -a -z -n -o alternates/porn-social -e porn social +python3 updateHostsFile.py -a -z -n -o alternates/gambling-porn-social -e gambling porn social +python3 updateHostsFile.py -a -z -n # Update the readmes. python3 updateReadme.py diff --git a/makeHostsWindows.bat b/makeHostsWindows.bat index a5929c2bb..137aa4d74 100644 --- a/makeHostsWindows.bat +++ b/makeHostsWindows.bat @@ -5,7 +5,7 @@ if not exist "%WINDIR%\py.exe" ( ECHO :: ERROR :: Download and install lastest Python 3.5 for Windows from https://www.python.org/downloads/ ECHO :: ERROR :: Exit... GOTO END -) ELSE ( +) ELSE ( GOTO PY35RT ) :PY35RT @@ -14,21 +14,21 @@ if not exist "%PROGRAMFILES%\python35\Python35.dll" ( ECHO :: ERROR :: Download and install lastest Python 3.5 for Windows from https://www.python.org/downloads/ ECHO :: ERROR :: Exit... GOTO END -) ELSE ( +) ELSE ( ECHO :: INFO :: Python 3.5 Runtime was found! ECHO :: INFO :: Running main script... GOTO :UPDATES ) :UPDATES ::These create various alternate hosts files by combining and adding the gambling, porn, and social media extensions. - updateHostsFile.py -a -o alternates\gambling -e gambling - updateHostsFile.py -a -n -o alternates\porn -e porn - updateHostsFile.py -a -n -o alternates\social -e social - updateHostsFile.py -a -n -o alternates\gambling-porn -e gambling porn - updateHostsFile.py -a -n -o alternates\gambling-social -e gambling social - updateHostsFile.py -a -n -o alternates\porn-social -e porn social - updateHostsFile.py -a -n -o alternates\gambling-porn-social -e gambling porn social - updateHostsFile.py -a -n + updateHostsFile.py -a -z -o alternates\gambling -e gambling + updateHostsFile.py -a -z -n -o alternates\porn -e porn + updateHostsFile.py -a -z -n -o alternates\social -e social + updateHostsFile.py -a -z -n -o alternates\gambling-porn -e gambling porn + updateHostsFile.py -a -z -n -o alternates\gambling-social -e gambling social + updateHostsFile.py -a -z -n -o alternates\porn-social -e porn social + updateHostsFile.py -a -z -n -o alternates\gambling-porn-social -e gambling porn social + updateHostsFile.py -a -z -n ::Update the readmes. updateReadme.py