From 44bd0710f74dc2059ddfd61c7a8806664b7e9531 Mon Sep 17 00:00:00 2001 From: earthlng Date: Wed, 25 Apr 2018 20:46:22 +0200 Subject: [PATCH] Update updater.bat --- updater.bat | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/updater.bat b/updater.bat index c36c995..9c7b2fa 100644 --- a/updater.bat +++ b/updater.bat @@ -192,7 +192,7 @@ REM ############ Merge function ############ :merge SETLOCAL DisableDelayedExpansion FOR /F tokens^=2^,^*^ delims^=^'^" %%G IN ('FINDSTR /R /C:"^user_pref[ ]*\([ ]*[\"'][a-z].*[\"'][ ]*,.*\)[ ]*;" "%~1"') DO (SET "[%%G]=%%H") -FOR /F tokens^=2^,^*^ delims^=^" %%G IN ('FINDSTR /R /C:"^//// --- comment-out --- \"[a-z].*\".*" "%~1"') DO (SET "__unset__%%G=1") +FOR /F tokens^=2^,^*^ delims^=^' %%G IN ('FINDSTR /R /C:"^//// --- comment-out --- '[a-z][^']*'.*" "%~1"') DO (SET "__unset__%%G=1") ( FOR /F "tokens=1,* delims=:" %%I IN ('FINDSTR /N "^" "%~1"') DO ( SET "_temp=%%J" @@ -205,19 +205,17 @@ FOR /F tokens^=2^,^*^ delims^=^" %%G IN ('FINDSTR /R /C:"^//// --- comment-out - ) ELSE ( ENDLOCAL FOR /F tokens^=2^ delims^=^'^" %%K IN ("%%J") DO ( - IF NOT "_user.js.parrot"=="%%K" ( - IF DEFINED __unset__%%K ( - ECHO://%%J - ) ELSE ( - IF DEFINED [%%K] ( - SETLOCAL EnableDelayedExpansion - FOR /F "delims=" %%L IN ("![%%K]!") DO ( - ENDLOCAL & ECHO:user_pref("%%K"%%L - SET "[%%K]=" - ) + IF DEFINED __unset__%%K ( + ECHO://%%J + ) ELSE ( + IF DEFINED [%%K] ( + SETLOCAL EnableDelayedExpansion + FOR /F "delims=" %%L IN ("![%%K]!") DO ( + ENDLOCAL & ECHO:user_pref("%%K"%%L + SET "[%%K]=" ) ) - ) ELSE (ECHO:%%J) + ) ) ) )