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>
95 lines
3.5 KiB
PowerShell
95 lines
3.5 KiB
PowerShell
# 05-OfficeShortcuts.ps1 - Public desktop + Default User Start Menu shortcuts for
|
|
# the core Office apps (Excel, Word, PowerPoint).
|
|
#
|
|
# Only runs if Office is actually installed - self-detects via EXE existence so it
|
|
# silently no-ops on PC types whose ppkg didn't include Office (Display kiosks,
|
|
# Wax/Trace, etc.). Office Click-to-Run installs the binaries but doesn't create
|
|
# desktop shortcuts; this script fills that gap.
|
|
#
|
|
# Shortcuts land in two places:
|
|
# - C:\Users\Public\Desktop\ - visible to all users immediately
|
|
# - C:\Users\Default\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\
|
|
# - inherited by every NEW user profile
|
|
# (Azure AD logons after the device is
|
|
# enrolled)
|
|
#
|
|
# Idempotent: overwrites existing .lnk files each run.
|
|
|
|
$officeApps = @(
|
|
@{ Exe = 'EXCEL.EXE'; Name = 'Excel' }
|
|
@{ Exe = 'WINWORD.EXE'; Name = 'Word' }
|
|
@{ Exe = 'POWERPNT.EXE'; Name = 'PowerPoint' }
|
|
)
|
|
|
|
# Office binary location varies by install type and version:
|
|
# - Office 2019+ / M365 / LTSC Click-to-Run: <PF>\Microsoft Office\root\Office16\
|
|
# - Office 2016 MSI (legacy): <PF>\Microsoft Office\Office16\ (no root\)
|
|
# - Office 2013 MSI: <PF>\Microsoft Office\Office15\
|
|
# - x86 Office on 64-bit Windows: Program Files (x86)\...
|
|
# The standard ShopFloor Office ppkg is x86 Click-to-Run so normal case
|
|
# is "Program Files (x86)\Microsoft Office\root\Office16\EXCEL.EXE", but
|
|
# we check all variants so the script works across SKUs.
|
|
$officeSearchRoots = @(
|
|
'C:\Program Files\Microsoft Office\root\Office16',
|
|
'C:\Program Files (x86)\Microsoft Office\root\Office16',
|
|
'C:\Program Files\Microsoft Office\Office16',
|
|
'C:\Program Files (x86)\Microsoft Office\Office16',
|
|
'C:\Program Files\Microsoft Office\Office15',
|
|
'C:\Program Files (x86)\Microsoft Office\Office15'
|
|
)
|
|
|
|
$officeRoot = $null
|
|
foreach ($base in $officeSearchRoots) {
|
|
if (Test-Path (Join-Path $base 'EXCEL.EXE')) {
|
|
$officeRoot = $base
|
|
break
|
|
}
|
|
}
|
|
|
|
if (-not $officeRoot) {
|
|
Write-Host "No Office install detected - skipping shortcut creation."
|
|
Write-Host "Searched:"
|
|
foreach ($p in $officeSearchRoots) {
|
|
$hit = if (Test-Path $p) { "(dir exists)" } else { "(missing)" }
|
|
Write-Host " $p $hit"
|
|
}
|
|
exit 0
|
|
}
|
|
|
|
Write-Host "Office detected at: $officeRoot"
|
|
|
|
$publicDesktop = 'C:\Users\Public\Desktop'
|
|
$defaultStart = 'C:\Users\Default\AppData\Roaming\Microsoft\Windows\Start Menu\Programs'
|
|
|
|
if (-not (Test-Path $defaultStart)) {
|
|
New-Item -Path $defaultStart -ItemType Directory -Force | Out-Null
|
|
}
|
|
|
|
$shell = New-Object -ComObject WScript.Shell
|
|
|
|
foreach ($app in $officeApps) {
|
|
$exePath = Join-Path $officeRoot $app.Exe
|
|
if (-not (Test-Path $exePath)) {
|
|
Write-Warning "$($app.Name) EXE not found at $exePath - skipping."
|
|
continue
|
|
}
|
|
foreach ($dest in @($publicDesktop, $defaultStart)) {
|
|
$lnkPath = Join-Path $dest "$($app.Name).lnk"
|
|
try {
|
|
$sc = $shell.CreateShortcut($lnkPath)
|
|
$sc.TargetPath = $exePath
|
|
$sc.WorkingDirectory = $officeRoot
|
|
$sc.IconLocation = "$exePath,0"
|
|
$sc.Save()
|
|
Write-Host " $($app.Name) -> $lnkPath"
|
|
}
|
|
catch {
|
|
Write-Warning "Failed to create $lnkPath : $($_.Exception.Message)"
|
|
}
|
|
}
|
|
}
|
|
|
|
[System.Runtime.InteropServices.Marshal]::ReleaseComObject($shell) | Out-Null
|
|
Write-Host "Office shortcuts created."
|
|
exit 0
|