From 3e4c56cf27d0b67457fa2a11e4fd26da0737833c Mon Sep 17 00:00:00 2001 From: earthlng Date: Sun, 13 Sep 2020 12:16:21 +0000 Subject: [PATCH] arkenfox support also fixes mixed line endings --- updater.bat | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/updater.bat b/updater.bat index b433678..0e883be 100644 --- a/updater.bat +++ b/updater.bat @@ -3,10 +3,10 @@ TITLE ghacks user.js updater REM ## ghacks-user.js updater for Windows REM ## author: @claustromaniac -REM ## version: 4.10 +REM ## version: 4.11 REM ## instructions: https://github.com/ghacksuserjs/ghacks-user.js/wiki/3.3-Updater-Scripts -SET v=4.10 +SET v=4.11 VERIFY ON CD /D "%~dp0" @@ -100,7 +100,10 @@ IF NOT EXIST user.js ( ) :exitloop IF NOT "!_name!"=="" ( - IF /I NOT "!_name!"=="!_name:ghacks=!" ( + SET "_tempvar=" + IF /I NOT "!_name!"=="!_name:ghacks=!" SET _tempvar=1 + IF /I NOT "!_name!"=="!_name:arkenfox=!" SET _tempvar=1 + IF !_tempvar! EQU 1 ( CALL :message "!_name! !_version:~2!,!_date!" ) ELSE (CALL :message "Current user.js version not recognised.") ) ELSE (CALL :message "Current user.js version not recognised.") @@ -136,10 +139,10 @@ IF EXIST user.js.new ( IF DEFINED _rfpalts ( CALL :message "Activating RFP Alternatives section..." CALL :activate user.js.new "[SETUP-non-RFP]" - ) - IF DEFINED _esr ( - CALL :message "Activating ESR section..." - CALL :activate user.js.new ".x still uses all the following prefs" + ) + IF DEFINED _esr ( + CALL :message "Activating ESR section..." + CALL :activate user.js.new ".x still uses all the following prefs" ) IF DEFINED _multi ( FORFILES /P user.js-overrides /M *.js >nul 2>&1 @@ -216,8 +219,8 @@ ENDLOCAL GOTO :EOF ::::::::::::::: Activate Section ::::::::::::::: -:activate -:: arg1 = file +:activate +:: arg1 = file :: arg2 = line substring SETLOCAL DisableDelayedExpansion (