Remove duplicacy of file infector checks

MAS/Separate-Files-Version/Activators/HWID_Activation.cmd

@@ -994,7 +994,6 @@ exit /b
 
 :dk_sppissue
 
-set w=
 sc start sppsvc %nul%
 set spperror=%errorlevel%
 
@@ -1003,14 +1002,6 @@ if %spperror% NEQ 1056 if %spperror% NEQ 0 (
 echo sc start sppsvc [Error Code: %spperror%]
 )
 
-echo "%spperror%" | findstr "577 225" %nul% && (
-echo:
-echo Your system is most likely infected with Mal%w%ware.
-echo:
-set fixes=%fixes% %mas%remove_mal%w%ware
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"
-)
-
 echo:
 %psc% "$job = Start-Job { (Get-WmiObject -Query 'SELECT * FROM %sps%').Version }; if (-not (Wait-Job $job -Timeout 20)) {write-host 'sppsvc is not working correctly. Help - %mas%troubleshoot'}"
 exit /b

MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd

@@ -1087,7 +1087,6 @@ exit /b
 
 :dk_sppissue
 
-set w=
 sc start sppsvc %nul%
 set spperror=%errorlevel%
 
@@ -1096,14 +1095,6 @@ if %spperror% NEQ 1056 if %spperror% NEQ 0 (
 echo sc start sppsvc [Error Code: %spperror%]
 )
 
-echo "%spperror%" | findstr "577 225" %nul% && (
-echo:
-echo Your system is most likely infected with Mal%w%ware.
-echo:
-set fixes=%fixes% %mas%remove_mal%w%ware
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"
-)
-
 echo:
 %psc% "$job = Start-Job { (Get-WmiObject -Query 'SELECT * FROM %sps%').Version }; if (-not (Wait-Job $job -Timeout 20)) {write-host 'sppsvc is not working correctly. Help - %mas%troubleshoot'}"
 exit /b

MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd

@@ -1460,7 +1460,6 @@ exit /b
 
 :dk_sppissue
 
-set w=
 sc start sppsvc %nul%
 set spperror=%errorlevel%
 
@@ -1469,14 +1468,6 @@ if %spperror% NEQ 1056 if %spperror% NEQ 0 (
 echo sc start sppsvc [Error Code: %spperror%]
 )
 
-echo "%spperror%" | findstr "577 225" %nul% && (
-echo:
-echo Your system is most likely infected with Mal%w%ware.
-echo:
-set fixes=%fixes% %mas%remove_mal%w%ware
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"
-)
-
 echo:
 %psc% "$job = Start-Job { (Get-WmiObject -Query 'SELECT * FROM %sps%').Version }; if (-not (Wait-Job $job -Timeout 20)) {write-host 'sppsvc is not working correctly. Help - %mas%troubleshoot'}"
 exit /b

MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd

@@ -984,7 +984,9 @@ for %%# in (%_oIds%) do (
 
 set skipprocess=
 if %_NoEditionChange%==1 if not defined _oBranding (
-echo %%# | findstr /i "Retail" %nul% && (
+set foundprod=
+call :ksdata chkprod %%#
+if not defined foundprod (
 set skipprocess=1
 echo Skipping Because NoEditionChange Mode   [%%#]
 )
@@ -2398,7 +2400,6 @@ exit /b
 
 :dk_sppissue
 
-set w=
 sc start sppsvc %nul%
 set spperror=%errorlevel%
 
@@ -2407,14 +2408,6 @@ if %spperror% NEQ 1056 if %spperror% NEQ 0 (
 echo sc start sppsvc [Error Code: %spperror%]
 )
 
-echo "%spperror%" | findstr "577 225" %nul% && (
-echo:
-echo Your system is most likely infected with Mal%w%ware.
-echo:
-set fixes=%fixes% %mas%remove_mal%w%ware
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"
-)
-
 echo:
 %psc% "$job = Start-Job { (Get-WmiObject -Query 'SELECT * FROM %sps%').Version }; if (-not (Wait-Job $job -Timeout 20)) {write-host 'sppsvc is not working correctly. Help - %mas%troubleshoot'}"
 exit /b
@@ -3410,6 +3403,10 @@ if %1==winkey if %osSKU%==%%C if not defined key (
 echo "!allapps!" | find /i "%%A" %nul1% && set key=%%B
 )
 
+if %1==chkprod if "%oVer%"=="%%C" if not defined foundprod (
+echo "%%D" | findstr /I "\<%2.*" %nul% && set foundprod=1
+)
+
 if %1==getinfo if not defined key if "%oVer%"=="%%C" (
 if /i "%2"=="%%D" (
 set key=%%B