Lightemerald/setup-script
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix activation check

Browse Source
This commit is contained in:
Lightemerald
2023-11-06 13:45:46 +01:00
parent 6a9b0aa7fa
commit 41c0fad50c
2 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
setupOffice.ps1
View File

@@ -27,13 +27,11 @@ function CheckOfficeInstall {
} }
function CheckActivation { function CheckActivation {
$osLicense = Get-CimInstance -ClassName SoftwareLicensingProduct | Where-Object { $_.Description -match "Windows" } $osLicense = Get-CimInstance SoftwareLicensingProduct -Filter "Name like 'Windows%'" | where { $_.PartialProductKey } | select Description, LicenseStatus
$officeLicense = Get-CimInstance -ClassName SoftwareLicensingProduct | Where-Object { $_.Description -match "Office" } $officeLicense = Get-CimInstance SoftwareLicensingProduct -Filter "Name like 'Office%'" | where { $_.PartialProductKey } | select Description, LicenseStatus
$windows = $osLicense.Description
$office = $officeLicense.Description
# if both activated return true # if both activated return true
if ($osLicense.LicenseStatus -eq 1 -and $officeLicense.LicenseStatus -eq 1) { if ($osLicense.LicenseStatus -eq 1 -and $officeLicense.LicenseStatus -eq 2) {
Write-Host "Windows and Office are activated." Write-Host "Windows and Office are activated."
return $true return $true
} else { } else {

23
setupReg.ps1
View File

@@ -87,27 +87,8 @@ function SetupEleveReg {
} }
Write-Host "Added registry entries" Write-Host "Added registry entries"
Write-Host "Unloading registry HIVE" Write-Host "Unloading registry HIVE"
$retryCount = 0 Write-Host "REG UNLOAD HKEY_USERS\$UserSID"
$retryLimit = 5 Start-Process powershell.exe -ArgumentList "REG UNLOAD HKEY_USERS\$UserSID" -WindowStyle Hidden
$success = $false
while (-not $success -and $retryCount -lt $retryLimit) {
Start-Sleep -s 5
Write-Host "REG UNLOAD HKEY_USERS\$UserSID (attempt $($retryCount + 1))"
$res = REG UNLOAD HKEY_USERS\$UserSID
if ($res -ne 0) {
Write-Host "Failed to unload $username's HKU registry hive. Retrying in 5 seconds..."
$retryCount++
}
else {
Write-Host "Unloaded $username's HKU registry hive."
$success = $true
}
}
if (-not $success) {
Write-Host "Failed to unload $username's HKU registry hive after $retryLimit attempts."
}
} else { } else {
Write-Host "Unable to get the user's HKU registry." Write-Host "Unable to get the user's HKU registry."
} }