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

Updater for Windows v3.0 (the real deal)

Browse source 
- Added -UpdateBatch switch so the updater can auto update itself on execution.
- Added new -LogP switch, that works just like -Log, but also opens the log file after updating.
- Added new -MultiOverrides switch, that uses any and all .js files in a 'user.js-overrides' sub-folder as overrides instead of the default 'user-overrides.js' file. Files are appended in alphabetical order.
- Added new -Merge switch, that uses a new algorithm to merge overrides instead of appending them. Files are parsed in alphabetical order and when there are conflicting records, the values of the last ones declared are the ones used. The order of said records doesn't change in the resulting file. Comments are appended normally. When the script is run with both -Merge and -MultiOverrides switches, an 'user-overrides-merged.js' file is also generated in the root directory for quick reference. Said file contains only the merged data from override files and can be safely discarded after updating.

For a more full list of changes, with jokes and nasty surprises, see my epic fail (#286).
This commit is contained in:
claustromaniac 2017-11-26 18:17:43 +00:00
parent a269e53f88
commit 3cb8da0956
1 changed files with 155 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

159
updater.bat
View file

@ -3,7 +3,7 @@ TITLE ghacks user.js updater
REM ### ghacks-user.js updater for Windows
REM ## author: @claustromaniac
REM ## version: 2.2
REM ## version: 3.0
SET _myname=%~n0
SET _myparams=%*
@ -18,13 +18,46 @@ IF /I "%~1"=="-unattended" (
IF /I "%~1"=="-log" (
SET _log=1
)
IF /I "%~1"=="-logp" (
SET _log=1
SET _logp=1
)
IF /I "%~1"=="-multioverrides" (
SET _multi=1
)
IF /I "%~1"=="-merge" (
SET _merge=1
)
IF /I "%~1"=="-updatebatch" (
SET _updateb=1
)
SHIFT
GOTO parse
:endparse
ECHO.
IF DEFINED _updateb (
ECHO Checking updater version...
ECHO.
IF EXIST "!_myname!-updated.bat" (
DEL /F "!_myname!-updated.bat"
)
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://github.com/ghacksuserjs/ghacks-user.js/raw/master/updater.bat', '!_myname!-updated.bat')" >nul
IF EXIST "!_myname!-updated.bat" (
CLS
SET "_myparams=!_myparams:-updatebatch=!"
SET "_myparams=!_myparams:-Updatebatch=!"
SET "_myparams=!_myparams:-UpdateBatch=!"
SET "_myparams=!_myparams:-UPDATEBATCH=!"
START CMD /C "!_myname!-updated.bat" !_myparams!
DEL /F "!_myname!.bat" >nul 2>&1
EXIT /B
) ELSE (
ECHO Failed. Make sure PowerShell is allowed internet access.
ECHO.
PAUSE
GOTO end
)
)
SET /A "_line=0"
IF NOT EXIST user.js (
ECHO user.js not detected in the current directory.
@ -47,7 +80,8 @@ IF NOT EXIST user.js (
:exitloop
IF !_line! GEQ 4 (
IF /I NOT "!_name!"=="!_name:ghacks=X!" (
ECHO ghacks user.js !_version:~2!,!_date!
SET _version=!_version:*version=version!
ECHO ghacks user.js !_version!,!_date!
) ELSE (
ECHO Current user.js version not recognised.
)
@ -96,8 +130,77 @@ IF EXIST user.js (
IF %ERRORLEVEL% EQU 0 (
IF DEFINED _merge (
ECHO.
ECHO Merging not supported yet...
ECHO Merging...
ECHO.
IF EXIST user-overrides-merged.js (
DEL /F user-overrides-merged.js
)
IF EXIST temp2 (
DEL /F temp2
)
IF EXIST temp3 (
DEL /F temp3
)
COPY /B /V /Y user.js-overrides\*.js user-overrides
FOR /F "tokens=* delims=" %%G IN (user-overrides) DO (
SET _pref=%%G
SET "_temp=!_pref: =!"
IF /I "user"=="!_temp:~0,4!" (
FOR /F "delims=," %%S IN ("!_pref!") DO (
SET _pref=%%S
)
SET _pref=!_pref:"=""!
FIND /I "!_pref!" user-overrides-merged.js >nul 2>&1
IF ERRORLEVEL 1 (
FIND /I "!_pref!" user-overrides >temp1
FOR /F "tokens=* delims=" %%X IN (temp1) DO (
SET _temp=%%X
SET "_temp=!_temp: =!"
IF /I "user"=="!_temp:~0,4!" (
SET _pref=%%X
)
)
ECHO !_pref!>>user-overrides-merged.js
)
) ELSE (
ECHO !_pref!>>user-overrides-merged.js
)
)
COPY /B /V /Y user.js+user-overrides-merged.js temp2
FOR /F "tokens=* delims=" %%G IN (temp2) DO (
SET _pref=%%G
SET "_temp=!_pref: =!"
IF /I "user"=="!_temp:~0,4!" (
FOR /F "delims=," %%S IN ("!_pref!") DO (
SET _pref=%%S
)
SET _pref=!_pref:"=""!
FIND /I "!_pref!" temp3 >nul 2>&1
IF ERRORLEVEL 1 (
FIND /I "!_pref!" temp2 >temp1
FOR /F "tokens=* delims=" %%X IN (temp1) DO (
SET _temp=%%X
SET "_temp=!_temp: =!"
IF /I "user"=="!_temp:~0,4!" (
SET _pref=%%X
)
)
ECHO !_pref!>>temp3
)
) ELSE (
ECHO !_pref!>>temp3
)
)
IF EXIST user.js (
DEL /F user.js
)
IF EXIST temp2 (
DEL /F temp2
)
REN temp3 user.js
IF EXIST temp1 (
DEL /F temp1
)
) ELSE (
ECHO.
ECHO Appending...
@ -109,7 +212,48 @@ IF EXIST user.js (
) ELSE (
IF EXIST "user-overrides.js" (
IF DEFINED _merge (
ECHO Merging user-overrides.js not supported yet...
ECHO Merging user-overrides.js...
IF EXIST temp2 (
DEL /F temp2
)
IF EXIST temp3 (
DEL /F temp3
)
COPY /B /V /Y user.js+user-overrides.js temp2
FOR /F "tokens=* delims=" %%G IN (temp2) DO (
SET _pref=%%G
SET "_temp=!_pref: =!"
IF /I "user"=="!_temp:~0,4!" (
FOR /F "delims=," %%S IN ("!_pref!") DO (
SET _pref=%%S
)
SET _pref=!_pref:"=""!
FIND /I "!_pref!" temp3 >nul 2>&1
IF ERRORLEVEL 1 (
FIND /I "!_pref!" temp2 >temp1
FOR /F "tokens=* delims=" %%X IN (temp1) DO (
SET _temp=%%X
SET "_temp=!_temp: =!"
IF /I "user"=="!_temp:~0,4!" (
SET _pref=%%X
)
)
ECHO !_pref!>>temp3
)
) ELSE (
ECHO !_pref!>>temp3
)
)
IF EXIST user.js (
DEL /F user.js
)
REN temp3 user.js
IF EXIST temp1 (
DEL /F temp1
)
IF EXIST temp2 (
DEL /F temp2
)
) ELSE (
ECHO Appending user-overrides.js...
ECHO.
@ -159,3 +303,10 @@ IF NOT DEFINED _log (
IF NOT DEFINED _ua PAUSE
)
:end
IF DEFINED _logp (
START user.js-update-log.txt
)
IF NOT "!_myname!"=="!_myname:-updated=X!" (
REN "!_myname!.bat" "!_myname:-updated=!.bat"
EXIT /B
)