updateHostsWindows.bat: minor consistency changes

* fix a few typos
* fix indentation
* lowercase commands since on Windows case doesn't matter
* add `/y /v` flags in copy commands
* remove unneeded `pushd` command since we `cd` after that anyway
* add `wscript.exe` when calling the .vbs script

diff --git a/updateHostsWindows.bat b/updateHostsWindows.bat
index 2c4415543565d8666b01aaa058900f09b65393c3..ee842a40930a49d8bbe6c982a18b82c6d8366cc5 100644 (file)
--- a/updateHostsWindows.bat
+++ b/updateHostsWindows.bat
@@ -1,61 +1,61 @@
-::\r
-:: This script will first create a backup of the original or current hosts\r
-:: file and save it in a file titled "hosts.skel"\r
-::\r
-:: If "hosts.skel" exists, the new hosts file with the customized unified hosts\r
-:: will be copied to the proper path. Next, the DNS cache will be refreshed.\r
-::\r
-:: THIS BAT FILE MUST BE LAUNCHED WITH ADMINISTRATOR PRIVILEGES\r
-:: Admin privileges script based on https://stackoverflow.com/a/10052222\r
-::\r
-::\r
-@ECHO OFF\r
-TITLE Update Hosts\r
-\r
-:: Check if we are administrator. If not, exit immediately.\r
-:: BatchGotAdmin\r
-:-------------------------------------\r
-REM  --> Check for permissions\r
-    IF "%PROCESSOR_ARCHITECTURE%" EQU "amd64" (\r
->nul 2>&1 "%SYSTEMROOT%\SysWOW64\cacls.exe" "%SYSTEMROOT%\SysWOW64\config\system"\r
-) ELSE (\r
->nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"\r
-)\r
-\r
-REM --> If error flag set, we do not have admin.\r
-if '%errorlevel%' NEQ '0' (\r
-    echo Requesting administrative privileges...\r
-    goto UACPrompt\r
-) else ( goto gotAdmin )\r
-\r
-:UACPrompt\r
-    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"\r
-    set params= %*\r
-    echo UAC.ShellExecute "cmd.exe", "/c ""%~s0"" %params:"=""%", "", "runas", 1 >> "%temp%\getadmin.vbs"\r
-\r
-    "%temp%\getadmin.vbs"\r
-    del "%temp%\getadmin.vbs"\r
-    exit /B\r
-\r
-:gotAdmin\r
-    pushd "%CD%"\r
-    CD /D "%~dp0"\r
-\r
-:BackupHosts\r
-       :: Backup default hosts file\r
-       if not exist "%WINDIR%\System32\drivers\etc\hosts.skel" (\r
-               COPY %WINDIR%\System32\drivers\etc\hosts %WINDIR%\System32\drivers\etc\hosts.skel\r
-       )\r
-\r
-:UpdateHosts\r
-       :: Update hosts file\r
-       python updateHostsFile.py --auto --minimise\r
-       \r
-       :: Move new hosts file in-place\r
-       COPY hosts %WINDIR%\System32\drivers\etc\\r
-\r
-       :: Flush the DNS cache\r
-       ipconfig /flushdns\r
-       \r
-       :: Summary note\r
-       pause\r
+::
+:: This script will first create a backup of the original or the current hosts
+:: file and save it in a file named "hosts.skel".
+::
+:: If the "hosts.skel" file exists, the new hosts file with the customized unified
+:: hosts will be copied to the proper path. Next, the DNS cache will be refreshed.
+::
+:: THIS BAT FILE MUST BE LAUNCHED WITH ADMINISTRATOR PRIVILEGES
+:: Admin privileges script based on https://stackoverflow.com/a/10052222
+::
+
+@echo off
+title Update Hosts
+
+:: Check if we are an administrator. If not, exit immediately.
+:: BatchGotAdmin
+:: Check for permissions
+if "%PROCESSOR_ARCHITECTURE%" equ "amd64" (
+    >nul 2>&1 "%SYSTEMROOT%\SysWOW64\cacls.exe" "%SYSTEMROOT%\SysWOW64\config\system"
+) else (
+    >nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+)
+
+:: If the error flag set, we do not have admin rights.
+if %ERRORLEVEL% neq 0 (
+    echo Requesting administrative privileges...
+    goto UACPrompt
+) else (
+    goto gotAdmin
+)
+
+:UACPrompt
+echo Set UAC = CreateObject^("Shell.Application"^) > "%TEMP%\getadmin.vbs"
+set params= %*
+echo UAC.ShellExecute "cmd.exe", "/c ""%~s0"" %params:"=""%", "", "runas", 1 >> "%TEMP%\getadmin.vbs"
+
+wscript.exe "%TEMP%\getadmin.vbs"
+del "%TEMP%\getadmin.vbs"
+exit /b
+
+:gotAdmin
+cd /d "%~dp0"
+
+:BackupHosts
+:: Backup the default hosts file
+if not exist "%WINDIR%\System32\drivers\etc\hosts.skel" (
+    copy /v "%WINDIR%\System32\drivers\etc\hosts" "%WINDIR%\System32\drivers\etc\hosts.skel"
+)
+
+:UpdateHosts
+:: Update hosts file
+python updateHostsFile.py --auto --minimise
+
+:: Copy over the new hosts file in-place
+copy /y /v hosts "%WINDIR%\System32\drivers\etc\"
+
+:: Flush the DNS cache
+ipconfig /flushdns
+
+:: Summary note
+pause