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

Fix for the self-update feature and misc

Browse Source 
Also minor but significant improvement to the merge function: it no longer writes temp files to the disk while processing data.
This commit is contained in:
claustromaniac 2017-11-28 21:53:20 +00:00
parent a389572243
commit 6ff3d1eb36
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
updater.bat
View File

@ -28,10 +28,40 @@ IF /I "%~1"=="-multioverrides" (
IF /I "%~1"=="-merge" ( IF /I "%~1"=="-merge" (
SET _merge=1 SET _merge=1
) )
IF /I "%~1"=="-updatebatch" (
SET _updateb=1
)
SHIFT SHIFT
GOTO parse GOTO parse
:endparse :endparse
ECHO. ECHO.
IF DEFINED _updateb (
IF NOT "!_myname:~0,9!"=="[updated]" (
ECHO Checking updater version...
ECHO.
DEL /F "[updated]!_myname!.bat" 2>nul
REM Uncomment the next line and comment the powershell call for testing.
REM COPY /B /V /Y "!_myname!.bat" "[updated]!_myname!.bat"
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://github.com/ghacksuserjs/ghacks-user.js/raw/master/updater.bat', '[updated]!_myname!.bat')" >nul
IF EXIST "[updated]!_myname!.bat" (
START CMD /C "[updated]!_myname!.bat" !_myparams!
EXIT /B
) ELSE (
ECHO Failed. Make sure PowerShell is allowed internet access.
ECHO.
PAUSE
EXIT /B
)
) ELSE (
IF EXIST "!_myname:~9!.bat" (
DEL /F "!_myname:~9!.bat"
CALL :begin
REN "!_myname!.bat" "!_myname:~9!.bat"
EXIT /B
)
)
)
:begin
SET /A "_line=0" SET /A "_line=0"
IF NOT EXIST user.js ( IF NOT EXIST user.js (
ECHO user.js not detected in the current directory. ECHO user.js not detected in the current directory.
@ -106,8 +136,8 @@ IF EXIST user.js (
ECHO. ECHO.
COPY /B /V /Y user.js-overrides\*.js user-overrides COPY /B /V /Y user.js-overrides\*.js user-overrides
CALL :merge user-overrides user-overrides-merged.js CALL :merge user-overrides user-overrides-merged.js
COPY /B /V /Y user.js+user-overrides-merged.js temp2 COPY /B /V /Y user.js+user-overrides-merged.js updatertempfile
CALL :merge temp2 user.js CALL :merge updatertempfile user.js
) ELSE ( ) ELSE (
ECHO. ECHO.
ECHO Appending... ECHO Appending...
@ -120,8 +150,8 @@ IF EXIST user.js (
IF EXIST "user-overrides.js" ( IF EXIST "user-overrides.js" (
IF DEFINED _merge ( IF DEFINED _merge (
ECHO Merging user-overrides.js... ECHO Merging user-overrides.js...
COPY /B /V /Y user.js+user-overrides.js temp2 COPY /B /V /Y user.js+user-overrides.js updatertempfile
CALL :merge temp2 user.js CALL :merge updatertempfile user.js
) ELSE ( ) ELSE (
ECHO Appending user-overrides.js... ECHO Appending user-overrides.js...
ECHO. ECHO.
@ -182,8 +212,7 @@ FOR /F "tokens=1,* delims=]" %%G IN ('find /n /v "" ^< "%~1"') DO (
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 (
FIND /I "!_pref!" %~1 >temp123 FOR /F "tokens=* delims=" %%X IN ('FIND /I "!_pref!" %~1') DO (
FOR /F "tokens=* delims=" %%X IN (temp123) 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!" (
@ -201,6 +230,5 @@ FOR /F "tokens=1,* delims=]" %%G IN ('find /n /v "" ^< "%~1"') DO (
ENDLOCAL ENDLOCAL
) )
ENDLOCAL ENDLOCAL
DEL /F %~1 temp123 >nul
GOTO :EOF GOTO :EOF
REM ############################ REM ############################