Git/firefox-user.js
1
0
Fork 0
mirror of https://github.com/arkenfox/user.js.git synced 2025-11-04 07:45:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

51
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,38 +207,37 @@ 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: =!" IF /I "user_pref"=="!_temp:~0,9!" (
IF /I "user_pref"=="!_temp:~0,9!" ( IF /I NOT "user.js.parrot"=="!_temp:~12,14!" (
IF /I NOT "user.js.parrot"=="!_temp:~12,14!" ( FOR /F "delims=," %%S IN ("!_pref!") DO (
FOR /F "delims=," %%S IN ("!_pref!") DO ( SET "_pref=%%S"
SET "_pref=%%S" )
) SET _pref=!_pref:"=""!
SET _pref=!_pref:"=""! FIND /I "!_pref!" %~2 >nul 2>&1
FIND /I "!_pref!" %~2 >nul 2>&1 IF ERRORLEVEL 1 (
IF ERRORLEVEL 1 ( FOR /F "tokens=* delims=" %%X IN ('FIND /I "!_pref!" %~1') DO (
FOR /F "tokens=* delims=" %%X IN ('FIND /I "!_pref!" %~1') DO ( SET "_temp=%%X"
SET "_temp=%%X" SET "_temp=!_temp: =!"
SET "_temp=!_temp: =!" IF /I "user_pref"=="!_temp:~0,9!" (
IF /I "user_pref"=="!_temp:~0,9!" ( SET "_pref=%%X"
SET "_pref=%%X"
)
) )
ECHO(!_pref!
) )
) ELSE ( ECHO(!_pref!>>%~2
ECHO(!_pref!
) )
) ELSE ( ) ELSE (
ECHO(!_pref! ECHO(!_pref!>>%~2
) )
ENDLOCAL ) ELSE (
ECHO(!_pref!>>%~2
) )
)>%~2 ENDLOCAL
)
ENDLOCAL ENDLOCAL
DEL /F %1 >nul DEL /F %1 >nul
GOTO :EOF GOTO :EOF