Compare commits

..

8 commits
3.13 ... master

Author SHA1 Message Date
WitherOrNot 6cfd6f455f LTSC detection 2026-11-11 05:36:43 -05:00
WitherOrNot ccfd1eb536 Revert "export-ignore"
This reverts commit b86cda40b2.
2026-11-11 04:39:16 -05:00
WitherOrNot cb5672904b AIO add missing code 2026-11-11 04:35:40 -05:00
WitherOrNot b86cda40b2 export-ignore 2026-11-11 04:30:58 -05:00
WitherOrNot eabab5dffb masver 2026-11-11 04:30:30 -05:00
WitherOrNot ee1a57254f Fix 4-6y ESU detection 2026-11-11 04:23:16 -05:00
Kyoko ce67e9cda9 Fix Batch Misplacement in Ohook AIO 2026-11-11 04:16:36 -05:00
WitherOrNot 06a2ed7b34 Revert "export-ignore"
This reverts commit a048798cc0.
2026-11-11 01:52:08 -05:00
11 changed files with 58 additions and 20 deletions

8
.gitattributes vendored
View file

@ -1,4 +1,4 @@
MAS export-ignore # MAS export-ignore
LICENSE export-ignore # LICENSE export-ignore
README.md export-ignore # README.md export-ignore
.gitattributes export-ignore # .gitattributes export-ignore

View file

@ -3,7 +3,7 @@
@::Is a real person even the one deciding to flag this or is it Copilot told to flag anything it decides not to like? @::Is a real person even the one deciding to flag this or is it Copilot told to flag anything it decides not to like?
@::If a campaign is using this script as a cover, please flag parts of the campaign instead of the script. This isn't the first time we experienced collateral damage due to campaigns completely unrelated to us. @::If a campaign is using this script as a cover, please flag parts of the campaign instead of the script. This isn't the first time we experienced collateral damage due to campaigns completely unrelated to us.
@::If you disagree that MAS is not malicious, we would appreciate if you contacted us to explain what constitutes MAS as "Sonbokli" and we'll look into it. Thank you. @::If you disagree that MAS is not malicious, we would appreciate if you contacted us to explain what constitutes MAS as "Sonbokli" and we'll look into it. Thank you.
@set masver=3.13 @set masver=3.14
@setlocal DisableDelayedExpansion @setlocal DisableDelayedExpansion
@echo off @echo off
@ -3440,6 +3440,8 @@ call :dk_color %_Yellow% "%mas%"
) )
) )
exit /b
::======================================================================================================================================== ::========================================================================================================================================
:oh_processmsi :oh_processmsi
@ -5094,9 +5096,7 @@ call :dk_color %Gray% "Checking Activation ID [%tsedition% LTSC
goto :ts_off goto :ts_off
) )
echo "%allapps%" | findstr /i "14240489-7c2d-42ee-a167-4913ca4672da b705d67e-527a-4f11-b904-7be441066a22 0b533b5e-08b6-44f9-b885-c2de291ba456 4cd0ab30-73a4-4dde-972c-512f05be31df 22badfe6-7d55-4485-874b-7ec317442134" %nul1% && ( echo "%allapps%" | findstr /i "14240489-7c2d-42ee-a167-4913ca4672da b705d67e-527a-4f11-b904-7be441066a22 0b533b5e-08b6-44f9-b885-c2de291ba456 4cd0ab30-73a4-4dde-972c-512f05be31df 22badfe6-7d55-4485-874b-7ec317442134 ab8c630c-395f-4241-b08d-736fbea0e1c8" %nul1% && (
call :dk_color %Red% "Checking Activated Licenses [Found Year 4-6 License]"
call :dk_color %Blue% "ESU licenses for years 4-6 prevent Windows update detection. MAS will automatically remove these licenses."
set esuexistbutnosup= set esuexistbutnosup=
set esuexistsup= set esuexistsup=
set esubadactids=1 set esubadactids=1
@ -11337,6 +11337,26 @@ if (-not $env:resetstuff) {
) )
$detected = $false $detected = $false
foreach ($eyactid in $badesuactids) {
$licenseStatus = Get-WmiInfo -tsactid $eyactid -property "LicenseStatus"
$prodName = Get-WmiInfo -tsactid $eyactid -property "Name"
if ($prodName) {
$nameParts = $prodName -split ',', 2
$prodName = if ($nameParts.Count -gt 1) { ($nameParts[1].Trim() -split '[ ,]')[0] } else { $null }
}
if ($licenseStatus -eq 1) {
$detected = $true
break
}
}
if ($detected) {
Write-Host "Checking Activated Licenses [Found Year 4-6 License]" -ForegroundColor White -BackgroundColor Red
Write-Host "ESU licenses for years 4-6 prevent Windows update detection. MAS will automatically remove these licenses." -ForegroundColor White -BackgroundColor Blue
Write-Host ""
}
foreach ($eyactid in $badesuactids) { foreach ($eyactid in $badesuactids) {
$licenseStatus = Get-WmiInfo -tsactid $eyactid -property "LicenseStatus" $licenseStatus = Get-WmiInfo -tsactid $eyactid -property "LicenseStatus"
$prodName = Get-WmiInfo -tsactid $eyactid -property "Name" $prodName = Get-WmiInfo -tsactid $eyactid -property "Name"

View file

@ -1,4 +1,4 @@
@set masver=3.13 @set masver=3.14
@echo off @echo off

View file

@ -1,4 +1,4 @@
@set masver=3.13 @set masver=3.14
@echo off @echo off

View file

@ -1,4 +1,4 @@
@set masver=3.13 @set masver=3.14
@echo off @echo off

View file

@ -1,4 +1,4 @@
@set masver=3.13 @set masver=3.14
@echo off @echo off
@ -1187,9 +1187,7 @@ call :dk_color %Gray% "Checking Activation ID [%tsedition% LTSC
goto :ts_off goto :ts_off
) )
echo "%allapps%" | findstr /i "14240489-7c2d-42ee-a167-4913ca4672da b705d67e-527a-4f11-b904-7be441066a22 0b533b5e-08b6-44f9-b885-c2de291ba456 4cd0ab30-73a4-4dde-972c-512f05be31df 22badfe6-7d55-4485-874b-7ec317442134" %nul1% && ( echo "%allapps%" | findstr /i "14240489-7c2d-42ee-a167-4913ca4672da b705d67e-527a-4f11-b904-7be441066a22 0b533b5e-08b6-44f9-b885-c2de291ba456 4cd0ab30-73a4-4dde-972c-512f05be31df 22badfe6-7d55-4485-874b-7ec317442134 ab8c630c-395f-4241-b08d-736fbea0e1c8" %nul1% && (
call :dk_color %Red% "Checking Activated Licenses [Found Year 4-6 License]"
call :dk_color %Blue% "ESU licenses for years 4-6 prevent Windows update detection. MAS will automatically remove these licenses."
set esuexistbutnosup= set esuexistbutnosup=
set esuexistsup= set esuexistsup=
set esubadactids=1 set esubadactids=1
@ -8923,6 +8921,26 @@ if (-not $env:resetstuff) {
) )
$detected = $false $detected = $false
foreach ($eyactid in $badesuactids) {
$licenseStatus = Get-WmiInfo -tsactid $eyactid -property "LicenseStatus"
$prodName = Get-WmiInfo -tsactid $eyactid -property "Name"
if ($prodName) {
$nameParts = $prodName -split ',', 2
$prodName = if ($nameParts.Count -gt 1) { ($nameParts[1].Trim() -split '[ ,]')[0] } else { $null }
}
if ($licenseStatus -eq 1) {
$detected = $true
break
}
}
if ($detected) {
Write-Host "Checking Activated Licenses [Found Year 4-6 License]" -ForegroundColor White -BackgroundColor Red
Write-Host "ESU licenses for years 4-6 prevent Windows update detection. MAS will automatically remove these licenses." -ForegroundColor White -BackgroundColor Blue
Write-Host ""
}
foreach ($eyactid in $badesuactids) { foreach ($eyactid in $badesuactids) {
$licenseStatus = Get-WmiInfo -tsactid $eyactid -property "LicenseStatus" $licenseStatus = Get-WmiInfo -tsactid $eyactid -property "LicenseStatus"
$prodName = Get-WmiInfo -tsactid $eyactid -property "Name" $prodName = Get-WmiInfo -tsactid $eyactid -property "Name"

View file

@ -1,4 +1,4 @@
@set masver=3.13 @set masver=3.14
@echo off @echo off

View file

@ -1,4 +1,4 @@
@set masver=3.13 @set masver=3.14
@echo off @echo off

View file

@ -1,4 +1,4 @@
@set masver=3.13 @set masver=3.14
@echo off @echo off

View file

@ -1,4 +1,4 @@
@set masver=3.13 @set masver=3.14
@echo off @echo off

View file

@ -80,5 +80,5 @@
--- ---
Latest Version: 3.13 Latest Version: 3.14
Release date: 11-Nov-2026 Release date: 11-Nov-2026