From e86d19a9f74e7640d245d5dc13de82ce939964bd Mon Sep 17 00:00:00 2001 From: earthlng Date: Wed, 25 Apr 2018 15:21:57 +0200 Subject: [PATCH] Update updater.bat --- updater.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/updater.bat b/updater.bat index 21da9da..38b3e65 100644 --- a/updater.bat +++ b/updater.bat @@ -191,8 +191,8 @@ GOTO :EOF REM ############ Merge function ############ :merge SETLOCAL DisableDelayedExpansion -FOR /F tokens^=2^,^*^ delims^=^'^" %%G IN ('FINDSTR /B /R /C:"user_pref.*\)[ ]*;" "%~1"') DO (IF NOT "%%H"=="" (SET "%%G=%%H")) -FOR /F tokens^=2^,^*^ delims^=^" %%G IN ('FINDSTR /B /R /C:"\/\/ comment-out .*" "%~1"') DO (SET "__unset__%%G=1") +FOR /F tokens^=2^,^*^ delims^=^'^" %%G IN ('FINDSTR /B /R /C:"user_pref[ ]*\([ ]*[\"'][^\"'][^\"']*[\"'][ ]*,.*\)[ ]*;" "%~1"') DO (SET "[%%G]=%%H") +FOR /F tokens^=2^,^*^ delims^=^" %%G IN ('FINDSTR /B /R /C:"\/\/\/\/ --- comment-out --- \"[^\"][^\"]*\".*" "%~1"') DO (SET "__unset__%%G=1") ( FOR /F "tokens=1,* delims=:" %%I IN ('FINDSTR /N "^" "%~1"') DO ( SET "_temp=%%J" @@ -209,11 +209,11 @@ FOR /F tokens^=2^,^*^ delims^=^" %%G IN ('FINDSTR /B /R /C:"\/\/ comment-out .*" IF DEFINED __unset__%%K ( ECHO://%%J ) ELSE ( - IF DEFINED %%K ( + IF DEFINED [%%K] ( SETLOCAL EnableDelayedExpansion - FOR /F "delims=" %%L IN ("!%%K!") DO ( + FOR /F "delims=" %%L IN ("![%%K]!") DO ( ENDLOCAL & ECHO:user_pref("%%K"%%L - SET "%%K=" + SET "[%%K]=" ) ) )