s83/user.js
1
0
Fork 0
mirror of https://github.com/arkenfox/user.js.git synced 2025-04-30 05:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "2nd merge optimisation"

Browse source 
This reverts commit c9e7f1ccfa.
This commit is contained in:
claustromaniac 2017-11-29 15:18:23 +00:00
parent c9e7f1ccfa
commit a126a32109
1 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
updater.bat
View file

@ -39,7 +39,7 @@ IF DEFINED _updateb (
IF NOT "!_myname:~0,9!"=="[updated]" ( IF NOT "!_myname:~0,9!"=="[updated]" (
ECHO Checking updater version... ECHO Checking updater version...
ECHO. ECHO.
IF EXIST "[updated]!_myname!.bat" ( DEL /F "[updated]!_myname!.bat" ) DEL /F "[updated]!_myname!.bat" 2>nul
REM Uncomment the next line and comment the powershell call for testing. 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 /V /Y "!_myname!.bat" "[updated]!_myname!.bat"
( (
@ -207,9 +207,9 @@ EXIT /B
REM ###### Merge function ###### REM ###### Merge function ######
:merge :merge
DEL /F %2 2>nul
SETLOCAL disabledelayedexpansion 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" SET "_pref=%%H"
SETLOCAL enabledelayedexpansion SETLOCAL enabledelayedexpansion
SET "_temp=!_pref: =!" SET "_temp=!_pref: =!"
@ -228,17 +228,16 @@ SETLOCAL disabledelayedexpansion
SET "_pref=%%X" SET "_pref=%%X"
) )
) )
ECHO(!_pref! ECHO(!_pref!>>%~2
) )
) ELSE ( ) ELSE (
ECHO(!_pref! ECHO(!_pref!>>%~2
) )
) ELSE ( ) ELSE (
ECHO(!_pref! ECHO(!_pref!>>%~2
) )
ENDLOCAL ENDLOCAL
) )
)>%~2
ENDLOCAL ENDLOCAL
DEL /F %1 >nul DEL /F %1 >nul
GOTO :EOF GOTO :EOF