Compare commits

...

2 Commits

Author SHA1 Message Date
WindowsAddict 962f7e326a Remove duplicacy of file infector checks 2024-07-17 03:54:38 +05:30
WindowsAddict 6f88a4bf90 More accurate check for Office Products in NoEditionChange mode 2024-07-17 01:19:06 +05:30
4 changed files with 7 additions and 37 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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