From 14a7d07ddb347ed280e0bfd3ab809561a8f3d693 Mon Sep 17 00:00:00 2001 From: earthlng Date: Wed, 25 Apr 2018 18:33:09 +0200 Subject: [PATCH] Update updater.bat --- updater.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/updater.bat b/updater.bat index 38b3e65..c36c995 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 (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 /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=1,* delims=:" %%I IN ('FINDSTR /N "^" "%~1"') DO ( SET "_temp=%%J"