mirror of
https://github.com/arkenfox/user.js.git
synced 2024-10-01 01:35:52 -04:00
2nd merge optimisation
While I figure out a fix for the missing characters... Enclosing the whole merging loop in parentheses and replacing the source file with the entire output at once is more efficient than appending individual lines with >>%~2. The script doesn't have to wait for the HD to continue processing.
This commit is contained in:
parent
ff9370b714
commit
c9e7f1ccfa
15
updater.bat
15
updater.bat
@ -39,7 +39,7 @@ IF DEFINED _updateb (
|
||||
IF NOT "!_myname:~0,9!"=="[updated]" (
|
||||
ECHO Checking updater version...
|
||||
ECHO.
|
||||
DEL /F "[updated]!_myname!.bat" 2>nul
|
||||
IF EXIST "[updated]!_myname!.bat" ( DEL /F "[updated]!_myname!.bat" )
|
||||
REM Uncomment the next line and comment the powershell call for testing.
|
||||
REM COPY /B /V /Y "!_myname!.bat" "[updated]!_myname!.bat"
|
||||
(
|
||||
@ -207,9 +207,9 @@ EXIT /B
|
||||
|
||||
REM ###### Merge function ######
|
||||
:merge
|
||||
DEL /F %2 2>nul
|
||||
SETLOCAL disabledelayedexpansion
|
||||
FOR /F "tokens=1,* delims=]" %%G IN ('find /n /v "" ^< "%~1"') DO (
|
||||
(
|
||||
FOR /F "tokens=1,* delims=]" %%G IN ('find /n /v "" ^< "%~1"') DO (
|
||||
SET "_pref=%%H"
|
||||
SETLOCAL enabledelayedexpansion
|
||||
SET "_temp=!_pref: =!"
|
||||
@ -228,16 +228,17 @@ FOR /F "tokens=1,* delims=]" %%G IN ('find /n /v "" ^< "%~1"') DO (
|
||||
SET "_pref=%%X"
|
||||
)
|
||||
)
|
||||
ECHO(!_pref!>>%~2
|
||||
ECHO(!_pref!
|
||||
)
|
||||
) ELSE (
|
||||
ECHO(!_pref!>>%~2
|
||||
ECHO(!_pref!
|
||||
)
|
||||
) ELSE (
|
||||
ECHO(!_pref!>>%~2
|
||||
ECHO(!_pref!
|
||||
)
|
||||
ENDLOCAL
|
||||
)
|
||||
)
|
||||
)>%~2
|
||||
ENDLOCAL
|
||||
DEL /F %1 >nul
|
||||
GOTO :EOF
|
||||
|
Loading…
Reference in New Issue
Block a user