New tools:
Configure-PC.bat/.ps1 - Interactive desktop tool for SupportUser to
configure a shopfloor PC after imaging. Two sections:
1. Machine number: if UDC/eDNC are still at placeholder 9999, prompt
to set the real number right now (updates UDC JSON + eDNC registry,
restarts UDC.exe with new args).
2. Auto-startup toggle: pick which apps start at user logon from a
numbered list (UDC, eDNC, Defect Tracker, WJ Shopfloor, Plant Apps).
Creates/removes .lnk files in AllUsers Startup folder. Toggle UI
shows [ON]/[ ] state, safe to re-run anytime. Plant Apps URL
resolved from .url file at runtime with hardcoded fallback to
https://mes-wjefferson.apps.lr.geaerospace.net/run/...
3. Item 6 in the toggle list: register/unregister a "Check Machine
Number" logon task for standard (non-admin) users. When enabled,
the task fires at every logon, checks for 9999, pops an InputBox
if found, updates both apps, then unregisters itself on success.
Check-MachineNumber.ps1 - The logon task script. Runs as the logged-in
user (needs GUI for InputBox), not SYSTEM. Writing to ProgramData + HKLM
is possible because 02-MachineNumberACLs.ps1 pre-grants BUILTIN\Users
write access on the two specific targets during imaging.
02-MachineNumberACLs.ps1 - Standard type-specific script (runs after
01-eDNC.ps1). Opens C:\ProgramData\UDC\udc_settings.json for Users:Modify
and HKLM:\...\GE Aircraft Engines\DNC\General for Users:SetValue. Narrow
scope, not blanket admin.
Execution order fixes in Run-ShopfloorSetup.ps1:
The dispatcher now has two lists: $skipInBaseline (scripts NOT run in the
alphabetical baseline loop) and $runAfterTypeSpecific (scripts run
explicitly after type-specific scripts complete). This fixes the bug where
06/07 ran before 01-eDNC.ps1 installed DnC, so eDNC/NTLARS shortcuts were
silently skipped.
New execution order:
Baseline: 00-PreInstall, 04-NetworkAndWinRM (skipping 05-08 + tools)
Type-specific: 01-eDNC, 02-MachineNumberACLs
Finalization: 06-OrganizeDesktop, 07-TaskbarLayout
06 internally calls 05 (Office shortcuts, Phase 0) and 08 (Edge config,
Phase 4) as sub-phases, so they also benefit from running late. Office
isn't installed until after the first reboot (ppkg streams C2R), so 05
no-ops at imaging time but succeeds when 06's SYSTEM logon task re-runs
it on the second boot. 08 resolves startup-tab URLs from .url files
delivered by DSC (even later); same self-heal via the logon task.
Other fixes in this commit:
- OpenText Setup-OpenText.ps1 Step 4: exclude WJ_Office.lnk, IBM_qks.lnk,
mmcs.lnk desktop shortcuts (matching the Step 3 .hep profile exclusion
from the previous commit). Removes stale copies from prior installs.
- 05-OfficeShortcuts.ps1: widened Office detection to 6 path variants
covering C2R + MSI + Office15/16, with diagnostic output on miss.
- 06-OrganizeDesktop.ps1: removed Phase 3 (desktop-root pin copies for
eDNC/NTLARS) so shortcuts live in Shopfloor Tools only, not duplicated
at root. Emptied $keepAtRoot. Added Phase 0 (call 05) and Phase 4
(call 08). Lazy folder creation + empty-folder cleanup. Scheduled task
now runs as SYSTEM (was BUILTIN\Users with Limited which failed the
admin check). Added NTLARS to 07's taskbar pin list.
- 08-EdgeDefaultBrowser.ps1: Plant Apps URL fallback hardcoded from
device-config.yaml.
- All new scripts have Start-Transcript logging to C:\Logs\SFLD\ with
timestamps and running-as identity.
- Run-ShopfloorSetup.ps1: Start-Transcript + Stop-Transcript wrapping
entire dispatcher run, writes to C:\Logs\SFLD\shopfloor-setup.log.
Configure-PC.bat added to SupportUser desktop copy list.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
159 lines
5.6 KiB
PowerShell
159 lines
5.6 KiB
PowerShell
# Check-MachineNumber.ps1 - Logon-triggered check for placeholder machine
|
|
# number. If UDC or eDNC are still at 9999, pops an InputBox for the user
|
|
# to enter the real number. On success, unregisters the scheduled task so
|
|
# the prompt never appears again.
|
|
#
|
|
# Runs as the LOGGED-IN USER (not SYSTEM) because it needs to show GUI.
|
|
# Writing to ProgramData + HKLM is possible because 02-MachineNumberACLs.ps1
|
|
# pre-granted BUILTIN\Users write access on those specific targets during
|
|
# imaging.
|
|
#
|
|
# Registered/unregistered by Configure-PC.ps1 (item 6 in the toggle list).
|
|
|
|
# --- Transcript logging ---
|
|
$logDir = 'C:\Logs\SFLD'
|
|
if (-not (Test-Path $logDir)) {
|
|
try { New-Item -ItemType Directory -Path $logDir -Force | Out-Null } catch { $logDir = $env:TEMP }
|
|
}
|
|
$transcriptPath = Join-Path $logDir 'Check-MachineNumber.log'
|
|
try { Start-Transcript -Path $transcriptPath -Append -Force | Out-Null } catch {}
|
|
Write-Host "Check-MachineNumber.ps1 starting $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss')"
|
|
Write-Host "Running as: $([System.Security.Principal.WindowsIdentity]::GetCurrent().Name)"
|
|
|
|
Add-Type -AssemblyName Microsoft.VisualBasic
|
|
Add-Type -AssemblyName System.Windows.Forms
|
|
|
|
$taskName = 'Check Machine Number'
|
|
$udcSettingsPath = 'C:\ProgramData\UDC\udc_settings.json'
|
|
$udcExePath = 'C:\Program Files\UDC\UDC.exe'
|
|
$ednRegPath = 'HKLM:\SOFTWARE\WOW6432Node\GE Aircraft Engines\DNC\General'
|
|
$site = 'West Jefferson'
|
|
|
|
# --- Read current values ---
|
|
$currentUdc = $null
|
|
$currentEdnc = $null
|
|
|
|
if (Test-Path $udcSettingsPath) {
|
|
try {
|
|
$json = Get-Content $udcSettingsPath -Raw | ConvertFrom-Json
|
|
$currentUdc = $json.GeneralSettings.MachineNumber
|
|
} catch {}
|
|
}
|
|
|
|
if (Test-Path $ednRegPath) {
|
|
try {
|
|
$currentEdnc = (Get-ItemProperty -Path $ednRegPath -Name MachineNo -ErrorAction Stop).MachineNo
|
|
} catch {}
|
|
}
|
|
|
|
# --- Check if placeholder ---
|
|
Write-Host "UDC machine number: $(if ($currentUdc) { $currentUdc } else { '(not found)' })"
|
|
Write-Host "eDNC machine number: $(if ($currentEdnc) { $currentEdnc } else { '(not found)' })"
|
|
|
|
if ($currentUdc -ne '9999' -and $currentEdnc -ne '9999') {
|
|
Write-Host "Machine number is set (not 9999). Unregistering task and exiting."
|
|
try {
|
|
Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue
|
|
} catch {}
|
|
try { Stop-Transcript | Out-Null } catch {}
|
|
exit 0
|
|
}
|
|
|
|
Write-Host "Placeholder 9999 detected - showing prompt."
|
|
|
|
# --- Show prompt ---
|
|
$promptLines = @()
|
|
$promptLines += "The machine number on this PC is still set to the"
|
|
$promptLines += "placeholder value (9999). Please enter the correct"
|
|
$promptLines += "machine number for this workstation."
|
|
$promptLines += ""
|
|
if ($currentUdc) { $promptLines += "Current UDC: $currentUdc" }
|
|
if ($currentEdnc) { $promptLines += "Current eDNC: $currentEdnc" }
|
|
$promptLines += ""
|
|
$promptLines += "Enter the new Machine Number:"
|
|
|
|
$prompt = $promptLines -join "`n"
|
|
$new = [Microsoft.VisualBasic.Interaction]::InputBox($prompt, "Set Machine Number", "")
|
|
|
|
if ([string]::IsNullOrWhiteSpace($new)) {
|
|
Write-Host "User cancelled. Will prompt again next logon."
|
|
try { Stop-Transcript | Out-Null } catch {}
|
|
exit 0
|
|
}
|
|
|
|
$new = $new.Trim()
|
|
|
|
# --- Validate ---
|
|
if ($new -notmatch '^\d+$') {
|
|
Write-Host "Invalid input: '$new' (not digits only). Will prompt again next logon."
|
|
[System.Windows.Forms.MessageBox]::Show(
|
|
"Machine number must be digits only.`n`nYou entered: '$new'`n`nThe prompt will appear again at next logon.",
|
|
"Invalid Machine Number",
|
|
[System.Windows.Forms.MessageBoxButtons]::OK,
|
|
[System.Windows.Forms.MessageBoxIcon]::Error
|
|
) | Out-Null
|
|
try { Stop-Transcript | Out-Null } catch {}
|
|
exit 0
|
|
}
|
|
|
|
# --- Update UDC ---
|
|
$results = @()
|
|
if (Test-Path $udcSettingsPath) {
|
|
# Stop UDC first
|
|
Get-Process UDC -ErrorAction SilentlyContinue | ForEach-Object {
|
|
try { $_.Kill(); $_.WaitForExit(5000) | Out-Null } catch {}
|
|
}
|
|
Start-Sleep -Seconds 1
|
|
|
|
try {
|
|
$json = Get-Content $udcSettingsPath -Raw | ConvertFrom-Json
|
|
$json.GeneralSettings.MachineNumber = $new
|
|
$json | ConvertTo-Json -Depth 99 | Set-Content -Path $udcSettingsPath -Encoding UTF8
|
|
$results += "UDC updated to $new"
|
|
} catch {
|
|
$results += "UDC FAILED: $_"
|
|
}
|
|
}
|
|
|
|
# --- Update eDNC ---
|
|
if (Test-Path $ednRegPath) {
|
|
try {
|
|
Set-ItemProperty -Path $ednRegPath -Name MachineNo -Value $new -Type String -Force
|
|
$results += "eDNC updated to $new"
|
|
} catch {
|
|
$results += "eDNC FAILED: $_"
|
|
}
|
|
}
|
|
|
|
# --- Relaunch UDC ---
|
|
if (Test-Path $udcExePath) {
|
|
try {
|
|
Start-Process -FilePath $udcExePath -ArgumentList @('-site', "`"$site`"", '-machine', $new)
|
|
} catch {}
|
|
}
|
|
|
|
# --- Show result ---
|
|
$summary = ($results -join "`n") + "`n`nTo apply eDNC changes, restart any running DncMain.exe."
|
|
[System.Windows.Forms.MessageBox]::Show(
|
|
$summary,
|
|
"Machine Number Updated",
|
|
[System.Windows.Forms.MessageBoxButtons]::OK,
|
|
[System.Windows.Forms.MessageBoxIcon]::Information
|
|
) | Out-Null
|
|
|
|
# --- Unregister task on success ---
|
|
Write-Host "Results: $($results -join '; ')"
|
|
$anyFail = $results | Where-Object { $_ -match 'FAILED' }
|
|
if (-not $anyFail) {
|
|
Write-Host "All updates succeeded. Unregistering logon task."
|
|
try {
|
|
Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue
|
|
} catch {}
|
|
} else {
|
|
Write-Host "Some updates failed. Task stays registered - will prompt again next logon."
|
|
}
|
|
|
|
Write-Host "Check-MachineNumber.ps1 finished $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss')"
|
|
try { Stop-Transcript | Out-Null } catch {}
|
|
exit 0
|