s83/user.js
1
0
Fork 0
mirror of https://github.com/arkenfox/user.js.git synced 2025-02-23 19:03:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

4.0b2

Browse Source 
Not all issues fixed yet.
This commit is contained in:
claustromaniac 2017-12-17 13:46:39 +00:00
parent 1262edee61
commit 240bcbfbee
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
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: 4.0b1 REM ## version: 4.0b2
SET _myname=%~n0 SET _myname=%~n0
SET _myparams=%* SET _myparams=%*
@ -27,7 +27,7 @@ IF DEFINED _updateb (
REM * Begin the normal routine REM * Begin the normal routine
REN "[updated]!_myname!.bat" "[updated]!_myname!.bat.old" REN "[updated]!_myname!.bat" "[updated]!_myname!.bat.old"
DEL /F "[updated]!_myname!.bat.old" DEL /F "[updated]!_myname!.bat.old"
CALL :message "Script updated^^! CALL :message "Script updated^!"
TIMEOUT 3 >nul TIMEOUT 3 >nul
CLS CLS
GOTO begin GOTO begin
@ -189,35 +189,35 @@ EXIT /B
REM ########### Message Function ########### REM ########### Message Function ###########
:message :message
SETLOCAL DisableDelayedExpansion
ECHO: ECHO:
ECHO: %~1 ECHO: %~1
ECHO: ECHO:
ENDLOCAL
GOTO :EOF GOTO :EOF
REM ############ Merge function ############ REM ############ Merge function ############
:merge :merge
SETLOCAL DisableDelayedExpansion SETLOCAL DisableDelayedExpansion
( (
FOR /F "tokens=1,* delims=," %%G IN ('FINDSTR /B /I /C:"user_pref" "%~1"') DO (SET "%%G=%%H") FOR /F "tokens=1,* delims=," %%G IN ('FINDSTR /B /I /C:"user_pref" "%~1"') DO (SET "%%G=%%H")
FOR /F "tokens=2,* delims=:," %%I IN ('FINDSTR /N "^" "%~1"') DO ( FOR /F "tokens=1,* delims=:" %%I IN ('FINDSTR /N "^" "%~1"') DO (
IF NOT [user_pref("_user.js.parrot"]==[%%I] ( FOR /F "tokens=1,* delims=," %%K IN ("%%J") DO (
IF DEFINED %%I ( IF NOT [user_pref("_user.js.parrot"]==[%%K] (
IF DEFINED %%K (
SETLOCAL EnableDelayedExpansion SETLOCAL EnableDelayedExpansion
FOR /F "delims=" %%K IN ("!%%I!") DO ( FOR /F "delims=" %%M IN ("!%%K!") DO (
ENDLOCAL ENDLOCAL
IF NOT "%%K"=="ALREADY MERGED" ( IF NOT "%%M"=="ALREADY MERGED" (
ECHO:%%I,%%K ECHO:%%K,%%M
SET "%%I=ALREADY MERGED" SET "%%K=ALREADY MERGED"
) )
) )
) ELSE ( ) ELSE (
IF "%%J"=="" ( ECHO:%%J
ECHO:%%I
) ELSE (
ECHO:%%I,%%J
)
) )
) ELSE ( ) ELSE (
ECHO:%%I,%%J ECHO:%%J
)
) )
) )
)>updatertempfile )>updatertempfile