diff --git a/updater.bat b/updater.bat index 21c83a2..650a20a 100644 --- a/updater.bat +++ b/updater.bat @@ -3,9 +3,10 @@ TITLE ghacks user.js updater REM ## ghacks-user.js updater for Windows REM ## author: @claustromaniac -REM ## version: 4.5 +REM ## version: 4.6 REM ## instructions: https://github.com/ghacksuserjs/ghacks-user.js/wiki/3.3-Updater-Scripts +VERIFY ON SET _myname=%~n0 SET _myparams=%* :parse @@ -39,7 +40,7 @@ IF DEFINED _updateb ( REM * Exit CALL :message "Updating script..." REM Uncomment the next line and comment the powershell call for testing. - REM COPY /B /V /Y "!_myname!.bat" "[updated]!_myname!.bat" + REM COPY /B /Y "!_myname!.bat" "[updated]!_myname!.bat" ( powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/ghacksuserjs/ghacks-user.js/master/updater.bat', '[updated]!_myname!.bat')" ) >nul 2>&1 @@ -62,7 +63,7 @@ IF DEFINED _updateb ( REN "!_myname:~9!.bat" "!_myname:~9!.bat.old" DEL /F "!_myname:~9!.bat.old" ) - COPY /B /V /Y "!_myname!.bat" "!_myname:~9!.bat" + COPY /B /Y "!_myname!.bat" "!_myname:~9!.bat" START CMD /C "!_myname:~9!.bat" !_myparams! ) ) @@ -75,7 +76,7 @@ ECHO: ECHO: ######################################## ECHO: #### user.js Updater for Windows #### ECHO: #### by claustromaniac #### -ECHO: #### v4.5 #### +ECHO: #### v4.6 #### ECHO: ######################################## ECHO: SET /A "_line=0" @@ -129,18 +130,18 @@ IF EXIST user.js.new ( IF NOT ERRORLEVEL 1 ( IF DEFINED _merge ( CALL :message "Merging..." - COPY /B /V /Y user.js-overrides\*.js user-overrides-merged.js + COPY /B /Y user.js-overrides\*.js user-overrides-merged.js CALL :merge user-overrides-merged.js - COPY /B /V /Y user.js.new+user-overrides-merged.js user.js.new + COPY /B /Y user.js.new+user-overrides-merged.js user.js.new CALL :merge user.js.new ) ELSE ( CALL :message "Appending..." - COPY /B /V /Y user.js.new+"user.js-overrides\*.js" user.js.new + COPY /B /Y user.js.new+"user.js-overrides\*.js" user.js.new ) ) ELSE (CALL :message "No override files found.") ) ELSE ( IF EXIST "user-overrides.js" ( - COPY /B /V /Y user.js.new+"user-overrides.js" "user.js.new" + COPY /B /Y user.js.new+"user-overrides.js" "user.js.new" IF DEFINED _merge ( CALL :message "Merging user-overrides.js..." CALL :merge user.js.new