Show 3rd party AV list when Powershell check fails

8 files changed, 16 insertions, 8 deletions

diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
index 40884ca..c2d039e 100644
--- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
@@ -219,7 +219,8 @@ cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode""
 echo:

 cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode"" | find /i "FullLanguage" %nul1% && (

 echo Failed to run Powershell command but Powershell is working.

-call :dk_color %Blue% "Check if your antivirus is blocking the script."

+echo:

+cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { if ($i.displayName -notlike '*windows*') { $n += $i.displayName } }; if ($n) { Write-Host ('Installed 3rd party Antivirus might be blocking the script - ' + ($n -join ', ')) -ForegroundColor White -BackgroundColor Blue }"""

 echo:

 set fixes=%fixes% %mas%troubleshoot

 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

diff --git a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
index f611460..5cabfd2 100644
--- a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
@@ -222,7 +222,8 @@ cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode""
 echo:

 cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode"" | find /i "FullLanguage" %nul1% && (

 echo Failed to run Powershell command but Powershell is working.

-call :dk_color %Blue% "Check if your antivirus is blocking the script."

+echo:

+cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { if ($i.displayName -notlike '*windows*') { $n += $i.displayName } }; if ($n) { Write-Host ('Installed 3rd party Antivirus might be blocking the script - ' + ($n -join ', ')) -ForegroundColor White -BackgroundColor Blue }"""

 echo:

 set fixes=%fixes% %mas%troubleshoot

 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
index 828f2a3..14b201d 100644
--- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
+++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
@@ -212,7 +212,8 @@ cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode""
 echo:

 cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode"" | find /i "FullLanguage" %nul1% && (

 echo Failed to run Powershell command but Powershell is working.

-call :dk_color %Blue% "Check if your antivirus is blocking the script."

+echo:

+cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { if ($i.displayName -notlike '*windows*') { $n += $i.displayName } }; if ($n) { Write-Host ('Installed 3rd party Antivirus might be blocking the script - ' + ($n -join ', ')) -ForegroundColor White -BackgroundColor Blue }"""

 echo:

 set fixes=%fixes% %mas%troubleshoot

 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
index f5f7a35..5627c84 100644
--- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
@@ -241,7 +241,8 @@ cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode""
 echo:

 cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode"" | find /i "FullLanguage" %nul1% && (

 echo Failed to run Powershell command but Powershell is working.

-call :dk_color %Blue% "Check if your antivirus is blocking the script."

+echo:

+cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { if ($i.displayName -notlike '*windows*') { $n += $i.displayName } }; if ($n) { Write-Host ('Installed 3rd party Antivirus might be blocking the script - ' + ($n -join ', ')) -ForegroundColor White -BackgroundColor Blue }"""

 echo:

 set fixes=%fixes% %mas%troubleshoot

 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

diff --git a/MAS/Separate-Files-Version/Change_Office_Edition.cmd b/MAS/Separate-Files-Version/Change_Office_Edition.cmd
index ae77e7e..0797a22 100644
--- a/MAS/Separate-Files-Version/Change_Office_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Office_Edition.cmd
@@ -172,7 +172,8 @@ cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode""
 echo:

 cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode"" | find /i "FullLanguage" %nul1% && (

 echo Failed to run Powershell command but Powershell is working.

-call :dk_color %Blue% "Check if your antivirus is blocking the script."

+echo:

+cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { if ($i.displayName -notlike '*windows*') { $n += $i.displayName } }; if ($n) { Write-Host ('Installed 3rd party Antivirus might be blocking the script - ' + ($n -join ', ')) -ForegroundColor White -BackgroundColor Blue }"""

 echo:

 set fixes=%fixes% %mas%troubleshoot

 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

diff --git a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
index e34a61c..9e6287b 100644
--- a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
@@ -177,7 +177,8 @@ cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode""
 echo:

 cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode"" | find /i "FullLanguage" %nul1% && (

 echo Failed to run Powershell command but Powershell is working.

-call :dk_color %Blue% "Check if your antivirus is blocking the script."

+echo:

+cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { if ($i.displayName -notlike '*windows*') { $n += $i.displayName } }; if ($n) { Write-Host ('Installed 3rd party Antivirus might be blocking the script - ' + ($n -join ', ')) -ForegroundColor White -BackgroundColor Blue }"""

 echo:

 set fixes=%fixes% %mas%troubleshoot

 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

diff --git a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
index 65edd77..36cc9b5 100644
--- a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
+++ b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
@@ -171,7 +171,8 @@ cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode""
 echo:

 cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode"" | find /i "FullLanguage" %nul1% && (

 echo Failed to run Powershell command but Powershell is working.

-call :dk_color %Blue% "Check if your antivirus is blocking the script."

+echo:

+cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { if ($i.displayName -notlike '*windows*') { $n += $i.displayName } }; if ($n) { Write-Host ('Installed 3rd party Antivirus might be blocking the script - ' + ($n -join ', ')) -ForegroundColor White -BackgroundColor Blue }"""

 echo:

 set fixes=%fixes% %mas%troubleshoot

 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

diff --git a/MAS/Separate-Files-Version/Troubleshoot.cmd b/MAS/Separate-Files-Version/Troubleshoot.cmd
index 392687a..e1fe1cb 100644
--- a/MAS/Separate-Files-Version/Troubleshoot.cmd
+++ b/MAS/Separate-Files-Version/Troubleshoot.cmd
@@ -172,7 +172,8 @@ cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode""
 echo:

 cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode"" | find /i "FullLanguage" %nul1% && (

 echo Failed to run Powershell command but Powershell is working.

-call :dk_color %Blue% "Check if your antivirus is blocking the script."

+echo:

+cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { if ($i.displayName -notlike '*windows*') { $n += $i.displayName } }; if ($n) { Write-Host ('Installed 3rd party Antivirus might be blocking the script - ' + ($n -join ', ')) -ForegroundColor White -BackgroundColor Blue }"""

 echo:

 set fixes=%fixes% %mas%troubleshoot

 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"