michel_ouba/FF_arkenfox_user.js
michel_ouba/FF_arkenfox_user.js
1
0
Fork 0
Code Releases Activity

Update updater.bat

Browse Source 
merge functionality and some cleanup
This commit is contained in:
earthlng 2017-11-26 21:47:30 +01:00 committed by GitHub
parent a269e53f88
commit 3ec7dae496
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
updater.bat
View File

@ -3,7 +3,7 @@ TITLE ghacks user.js updater
REM ### ghacks-user.js updater for Windows REM ### ghacks-user.js updater for Windows
REM ## author: @claustromaniac REM ## author: @claustromaniac
REM ## version: 2.2 REM ## version: 3.0-alpha57
SET _myname=%~n0 SET _myname=%~n0
SET _myparams=%* SET _myparams=%*
@ -18,9 +18,20 @@ IF /I "%~1"=="-unattended" (
IF /I "%~1"=="-log" ( IF /I "%~1"=="-log" (
SET _log=1 SET _log=1
) )
IF /I "%~1"=="-logp" (
SET _log=1
SET _logp=1
)
IF /I "%~1"=="-multioverrides" ( IF /I "%~1"=="-multioverrides" (
SET _multi=1 SET _multi=1
) )
IF /I "%~1"=="-merge" (
SET _merge=1
)
REM case-sensitive check because we need to strip it from params
IF "%~1"=="-updatebatch" (
SET _updateb=1
)
SHIFT SHIFT
GOTO parse GOTO parse
:endparse :endparse
@ -96,8 +107,15 @@ IF EXIST user.js (
IF %ERRORLEVEL% EQU 0 ( IF %ERRORLEVEL% EQU 0 (
IF DEFINED _merge ( IF DEFINED _merge (
ECHO. ECHO.
ECHO Merging not supported yet... ECHO Merging...
ECHO. ECHO.
DEL /F user-overrides-merged.js temp2 temp3 2>nul
COPY /B /V /Y user.js-overrides\*.js user-overrides
CALL :mergeprefs user-overrides user-overrides-merged.js
COPY /B /V /Y user.js+user-overrides-merged.js temp2
CALL :mergeprefs temp2 temp3
DEL /F temp2 2>nul
MOVE /Y temp3 user.js
) ELSE ( ) ELSE (
ECHO. ECHO.
ECHO Appending... ECHO Appending...
@ -109,7 +127,12 @@ IF EXIST user.js (
) ELSE ( ) ELSE (
IF EXIST "user-overrides.js" ( IF EXIST "user-overrides.js" (
IF DEFINED _merge ( IF DEFINED _merge (
ECHO Merging user-overrides.js not supported yet... ECHO Merging user-overrides.js...
DEL /F temp2 temp3 2>nul
COPY /B /V /Y user.js+user-overrides.js temp2
CALL :mergeprefs temp2 temp3
DEL /F temp2 2>nul
MOVE /Y temp3 user.js
) ELSE ( ) ELSE (
ECHO Appending user-overrides.js... ECHO Appending user-overrides.js...
ECHO. ECHO.
@ -159,3 +182,41 @@ IF NOT DEFINED _log (
IF NOT DEFINED _ua PAUSE IF NOT DEFINED _ua PAUSE
) )
:end :end
IF DEFINED _logp (
START user.js-update-log.txt
)
EXIT /B
REM Function section starts below here
:mergeprefs
FOR /F "tokens=* delims=" %%G IN (%~1) DO (
SET _pref=%%G
SET "_temp=!_pref: =!"
IF /I "user_pref"=="!_temp:~0,9!" (
FOR /F "delims=," %%S IN ("!_pref!") DO (
SET _pref=%%S
)
SET _pref=!_pref:"=""!
FIND /I "!_pref!" %~2 >nul 2>&1
IF ERRORLEVEL 1 (
FIND /I "!_pref!" %~1 >temp123
FOR /F "tokens=* delims=" %%X IN (temp123) DO (
SET _temp=%%X
SET "_temp=!_temp: =!"
IF /I "user_pref"=="!_temp:~0,9!" (
SET _pref=%%X
)
)
ECHO !_pref!>>%~2
)
) ELSE (
ECHO !_pref!>>%~2
)
)
DEL /F temp123 2>nul
REM DEL /F %~1 2>nul
GOTO EOF
REM end of mergeprefs
:EOF