From: crazy-max <redacted>
Date: Thu, 22 Dec 2016 15:30:26 +0000 (+0100)
Subject: Missing args (#225)
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=ff05417f7874eba80fb357868194b6de9b4c0979;p=stevenblack-hosts.git

Missing args (#225)
Add title to bat windows
---

diff --git a/makeHostsWindows.bat b/makeHostsWindows.bat
index f5816d5d2..fbfc6802a 100644
--- a/makeHostsWindows.bat
+++ b/makeHostsWindows.bat
@@ -1,4 +1,5 @@
 @ECHO OFF
+TITLE Make Hosts
 
 if not exist "%WINDIR%\py.exe" (
 	ECHO :: ERROR :: Python 3.5 Runtime NOT FOUND...
diff --git a/readme.md b/readme.md
index fa0a92af7..5951f8927 100644
--- a/readme.md
+++ b/readme.md
@@ -225,7 +225,7 @@ sudo dscacheutil -flushcache;sudo killall -HUP mDNSResponder
 |`makeHostsWindows.bat` BATCH file will create various alternate hosts files by combining and adding the gambling, porn, and social media extensions. You need to be connected to the Internet. This file REQUIRED installed Python 3.5.x runtime environment in Windows System. Launch this file as normal user.|
 :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-|Run `updateHostsWindows.bat` BATCH file will replace hosts file and reload DNS cache in Windows System. You need to be connected to the Internet. This file REQUIRED installed Python 3.5.x runtime environment in Windows System.|
+|`updateHostsWindows.bat` BATCH file will replace hosts file and reload DNS cache in Windows System. You need to be connected to the Internet. This file REQUIRED installed Python 3.5.x runtime environment in Windows System.|
 :---------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 
 |If you want using huge hosts file with merged [hphosts](https://www.hosts-file.net) (NOT INCLUDED HERE) you need to DISABLE and STOP `Dnscache` service before you replace hosts file in Windows Systems. You have been warned.|
diff --git a/updateHostsWindows.bat b/updateHostsWindows.bat
index 37c4a84cb..9dbcfe875 100644
--- a/updateHostsWindows.bat
+++ b/updateHostsWindows.bat
@@ -1,72 +1,77 @@
-:: This script will create in first running backup of ORIGINAL/CURRENT hosts file in hosts.skel file.
-:: If hosts.skel file exists, then NEW copy with customized unified hosts file will be copied to proper path.
-:: Next DNS Cache will be refreshed.
-:: THIS BAT FILE WILL BE LAUNCHED WITH ADMINISTRATOR PRIVILIGES
-@ECHO OFF
-
-VER | FINDSTR /L "5.1." > NUL
-IF %ERRORLEVEL% EQU 0 GOTO START
-
-VER | FINDSTR /L "5.2." > NUL
-IF %ERRORLEVEL% EQU 0 GOTO START
-
-:UAC_ADMIN
->nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"  
-if '%ERRORLEVEL%' NEQ '0' (
-    ECHO Requesting administrative privileges...
-    GOTO UAC_PROMPT
-) else (
-    GOTO ADMIN
-)
-
-:UAC_PROMPT
-ECHO Set UAC = CreateObject^("Shell.Application"^) > "%TEMP%\getadmin.vbs"
-ECHO UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%TEMP%\getadmin.vbs"
-"%TEMP%\getadmin.vbs"
-EXIT /B
-
-:ADMIN
-if exist "%TEMP%\getadmin.vbs" (
-    DEL "%TEMP%\getadmin.vbs"
-)
-pushd "%CD%"
-CD /D "%~dp0"
-CD %CD%
-%COMSPEC% /c "updateHostsWindows.bat" start
-EXIT
-
-:START
-if not exist "%WINDIR%\py.exe" (
-	ECHO :: ERROR :: Python 3.5 Runtime NOT FOUND...
-	ECHO :: ERROR :: Download and install lastest Python 3.5 for Windows from https://www.python.org/downloads/
-	ECHO :: ERROR :: Exit...
-	GOTO END
-) ELSE ( 
-	GOTO PY35RT
-)
-
-:PY35RT
-if not exist "%LOCALAPPDATA%\Programs\Python\Python35\Python35.dll" (
-	ECHO :: ERROR :: Python 3.5 Runtime NOT FOUND...
-	ECHO :: ERROR :: Download and install lastest Python 3.5 for Windows from https://www.python.org/downloads/
-	ECHO :: ERROR :: Exit...
-	GOTO END
-) ELSE ( 
-	ECHO :: INFO :: Python 3.5 Runtime was found...
-	ECHO :: INFO :: Running main script...
-    GOTO DNSCHECK
-)
-
-:DNSCHECK
-if not exist "%WINDIR%\System32\drivers\etc\hosts.skel" (
-	COPY %WINDIR%\System32\drivers\etc\hosts %WINDIR%\System32\drivers\etc\hosts.skel
-	GOTO :CLEARDNS
-)
-
-:CLEARDNS
-updateHostsFile.py -a
-COPY hosts %WINDIR%\System32\drivers\etc\
-ipconfig /flushdns
-GOTO END
-
-:END
+:: This script will create in first running backup of ORIGINAL/CURRENT hosts file in hosts.skel file.
+:: If hosts.skel file exists, then NEW copy with customized unified hosts file will be copied to proper path.
+:: Next DNS Cache will be refreshed.
+:: THIS BAT FILE WILL BE LAUNCHED WITH ADMINISTRATOR PRIVILIGES
+@ECHO OFF
+SETLOCAL EnableDelayedExpansion
+TITLE Update Hosts
+
+VER | FINDSTR /L "5.1." > NUL
+IF %ERRORLEVEL% EQU 0 GOTO START
+
+VER | FINDSTR /L "5.2." > NUL
+IF %ERRORLEVEL% EQU 0 GOTO START
+
+CLS
+IF "%1"=="" GOTO CHECK_UAC
+IF "%1"=="start" GOTO START
+
+:CHECK_UAC
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"  
+If '%ERRORLEVEL%' NEQ '0' (
+    ECHO Requesting administrative privileges...
+    GOTO UAC_PROMPT
+) Else (
+    GOTO ADMIN
+)
+
+:UAC_PROMPT
+ECHO Set UAC = CreateObject^("Shell.Application"^) > "%TEMP%\getadmin.vbs"
+ECHO UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%TEMP%\getadmin.vbs"
+"%TEMP%\getadmin.vbs"
+EXIT /B
+
+:ADMIN
+IF EXIST "%TEMP%\getadmin.vbs" ( DEL "%TEMP%\getadmin.vbs" )
+PUSHD "%CD%"
+CD /D "%~dp0"
+CD %CD%
+%COMSPEC% /c "updateHostsWindows.bat" start
+EXIT
+
+:START
+if not exist "%WINDIR%\py.exe" (
+	ECHO :: ERROR :: Python 3.5 Runtime NOT FOUND...
+	ECHO :: ERROR :: Download and install lastest Python 3.5 for Windows from https://www.python.org/downloads/
+	ECHO :: ERROR :: Exit...
+	GOTO END
+) ELSE ( 
+	GOTO PY35RT
+)
+
+:PY35RT
+if not exist "%LOCALAPPDATA%\Programs\Python\Python35\Python35.dll" (
+	ECHO :: ERROR :: Python 3.5 Runtime NOT FOUND...
+	ECHO :: ERROR :: Download and install lastest Python 3.5 for Windows from https://www.python.org/downloads/
+	ECHO :: ERROR :: Exit...
+	GOTO END
+) ELSE ( 
+	ECHO :: INFO :: Python 3.5 Runtime was found...
+	ECHO :: INFO :: Running main script...
+    GOTO DNSCHECK
+)
+
+:DNSCHECK
+if not exist "%WINDIR%\System32\drivers\etc\hosts.skel" (
+	COPY %WINDIR%\System32\drivers\etc\hosts %WINDIR%\System32\drivers\etc\hosts.skel
+	GOTO :CLEARDNS
+)
+
+:CLEARDNS
+updateHostsFile.py -a
+COPY hosts %WINDIR%\System32\drivers\etc\
+ipconfig /flushdns
+GOTO END
+
+:END
+ENDLOCAL