Fix 5 bugs from shopfloor-setup transcript review
1. UDC JSON ACL: set on directory C:\ProgramData\UDC\ with
ContainerInherit+ObjectInherit instead of the file. UDC_Setup.exe
gets killed by KillAfterDetection before UDC.exe creates
udc_settings.json, so the file doesn't exist at ACL-grant time.
Directory-level ACL with inheritance covers any file created later.
2. Set-MachineNumber.ps1 auto-running: the type-specific loop's
Get-ChildItem -Filter "*.ps1" picked up the desktop tool alongside
the numbered installer scripts. Added Where-Object { $_.Name -match
'^\d' } so only numbered-prefix scripts (01-eDNC, 02-ACLs) run.
3. WJ Shopfloor copy-to-self: Phase 1 sweep moved WJ Shopfloor.lnk
into Shopfloor Tools\, then Phase 2's Find-ExistingLnk found it
there and tried to Copy-Item to the same path. Now checks if
resolved source path == destination and prints "exists: (already
in Shopfloor Tools)" instead of erroring.
4. NTLARS missing from taskbar pins: the $pinSpec entry was never
added to 07-TaskbarLayout.ps1 despite the comment update. Added
between eDNC and Defect_Tracker in pin order.
5. shutdown /a stderr noise: 15+ red "Unable to abort system shutdown"
lines in the transcript from shutdown.exe writing to stderr when no
shutdown is pending. Changed all occurrences in Run-ShopfloorSetup,
00-PreInstall-MachineApps to: cmd /c "shutdown /a 2>nul" *>$null
which suppresses both native stderr and PS error stream.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -16,21 +16,30 @@ Write-Host "Running as: $([System.Security.Principal.WindowsIdentity]::GetCurren
|
||||
Write-Host ""
|
||||
Write-Host "Setting ACLs for standard-user machine number access..."
|
||||
|
||||
# --- UDC settings JSON ---
|
||||
$udcJson = 'C:\ProgramData\UDC\udc_settings.json'
|
||||
if (Test-Path -LiteralPath $udcJson) {
|
||||
# --- UDC settings directory ---
|
||||
# Set ACL on the DIRECTORY (not the file) with inheritance so that
|
||||
# udc_settings.json inherits the permission whenever UDC.exe creates it.
|
||||
# UDC_Setup.exe is killed by KillAfterDetection before UDC.exe writes the
|
||||
# JSON, so the file doesn't exist at this point. Directory-level ACL with
|
||||
# ContainerInherit + ObjectInherit covers any file created inside later.
|
||||
$udcDir = 'C:\ProgramData\UDC'
|
||||
if (Test-Path -LiteralPath $udcDir) {
|
||||
try {
|
||||
$acl = Get-Acl -LiteralPath $udcJson
|
||||
$acl = Get-Acl -LiteralPath $udcDir
|
||||
$rule = New-Object System.Security.AccessControl.FileSystemAccessRule(
|
||||
'BUILTIN\Users', 'Modify', 'Allow')
|
||||
'BUILTIN\Users', 'Modify',
|
||||
([System.Security.AccessControl.InheritanceFlags]::ContainerInherit -bor
|
||||
[System.Security.AccessControl.InheritanceFlags]::ObjectInherit),
|
||||
[System.Security.AccessControl.PropagationFlags]::None,
|
||||
'Allow')
|
||||
$acl.AddAccessRule($rule)
|
||||
Set-Acl -LiteralPath $udcJson -AclObject $acl -ErrorAction Stop
|
||||
Write-Host " UDC JSON: BUILTIN\Users granted Modify on $udcJson"
|
||||
Set-Acl -LiteralPath $udcDir -AclObject $acl -ErrorAction Stop
|
||||
Write-Host " UDC dir: BUILTIN\Users granted Modify (inherited) on $udcDir"
|
||||
} catch {
|
||||
Write-Warning " Failed to set ACL on $udcJson : $_"
|
||||
Write-Warning " Failed to set ACL on $udcDir : $_"
|
||||
}
|
||||
} else {
|
||||
Write-Host " UDC JSON not found at $udcJson - skipping (UDC not installed?)" -ForegroundColor DarkGray
|
||||
Write-Host " UDC dir not found at $udcDir - skipping (UDC not installed?)" -ForegroundColor DarkGray
|
||||
}
|
||||
|
||||
# --- eDNC registry key ---
|
||||
|
||||
Reference in New Issue
Block a user