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>
139 lines
5.8 KiB
PowerShell
139 lines
5.8 KiB
PowerShell
# 07-TaskbarLayout.ps1 - Minimal taskbar pinner.
|
|
#
|
|
# Reads the shortcuts that 06-OrganizeDesktop.ps1 created in
|
|
# C:\Users\Public\Desktop\Shopfloor Tools\ and writes a LayoutModification.xml
|
|
# that pins them to the taskbar along with Microsoft Edge.
|
|
#
|
|
# This script does NOT create, move, or copy any shortcuts - all shortcut
|
|
# management lives in 06. 07 is the last-mile taskbar config only.
|
|
#
|
|
# Pin order (left to right): Edge, WJ Shopfloor, UDC, eDNC, NTLARS, Defect_Tracker.
|
|
#
|
|
# LayoutModification.xml is written to the Default User profile shell
|
|
# directory, which means the pins apply on FIRST LOGON of any new user
|
|
# profile. Existing profiles don't re-read the Default User template, so
|
|
# they won't pick up the pins without a manual re-pin or profile delete.
|
|
# This is a Windows design limitation - syspin.exe style hacks are the
|
|
# only workaround for existing profiles, and they're unsupported.
|
|
|
|
$ErrorActionPreference = 'Continue'
|
|
|
|
# ============================================================================
|
|
# Admin check - writing to the Default User profile requires elevation.
|
|
# ============================================================================
|
|
$isAdmin = ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
|
|
if (-not $isAdmin) {
|
|
Write-Host ""
|
|
Write-Host "ERROR: 07-TaskbarLayout.ps1 must run as Administrator." -ForegroundColor Red
|
|
Write-Host " Re-run from an elevated PowerShell." -ForegroundColor Red
|
|
Write-Host ""
|
|
exit 1
|
|
}
|
|
|
|
$publicDesktop = 'C:\Users\Public\Desktop'
|
|
$shopfloorToolsDir = Join-Path $publicDesktop 'Shopfloor Tools'
|
|
$defaultUserShell = 'C:\Users\Default\AppData\Local\Microsoft\Windows\Shell'
|
|
$layoutXmlPath = Join-Path $defaultUserShell 'LayoutModification.xml'
|
|
|
|
# ============================================================================
|
|
# Pin list: exact ordered list of shortcut names to pin. Each entry points
|
|
# at a .lnk file via a Windows environment-variable-expanded path. Edge is
|
|
# special-cased to its default Start Menu location since Windows maintains
|
|
# it; all other entries reference C:\Users\Public\Desktop\Shopfloor Tools\
|
|
# which 06-OrganizeDesktop.ps1 populates.
|
|
# ============================================================================
|
|
$pinSpec = @(
|
|
@{
|
|
Name = 'Microsoft Edge'
|
|
Path = '%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs\Microsoft Edge.lnk'
|
|
# Resolved literal path used to check existence (can't Test-Path an
|
|
# unexpanded env var reliably on older PS versions)
|
|
Literal = 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Microsoft Edge.lnk'
|
|
}
|
|
@{
|
|
Name = 'WJ Shopfloor'
|
|
Path = '%PUBLIC%\Desktop\Shopfloor Tools\WJ Shopfloor.lnk'
|
|
Literal = (Join-Path $shopfloorToolsDir 'WJ Shopfloor.lnk')
|
|
}
|
|
@{
|
|
Name = 'UDC'
|
|
Path = '%PUBLIC%\Desktop\Shopfloor Tools\UDC.lnk'
|
|
Literal = (Join-Path $shopfloorToolsDir 'UDC.lnk')
|
|
}
|
|
@{
|
|
Name = 'eDNC'
|
|
Path = '%PUBLIC%\Desktop\Shopfloor Tools\eDNC.lnk'
|
|
Literal = (Join-Path $shopfloorToolsDir 'eDNC.lnk')
|
|
}
|
|
@{
|
|
Name = 'Defect_Tracker'
|
|
Path = '%PUBLIC%\Desktop\Shopfloor Tools\Defect_Tracker.lnk'
|
|
Literal = (Join-Path $shopfloorToolsDir 'Defect_Tracker.lnk')
|
|
}
|
|
)
|
|
|
|
# ============================================================================
|
|
# Build the pin list - skip any whose .lnk is missing
|
|
# ============================================================================
|
|
Write-Host ""
|
|
Write-Host "Checking which Shopfloor Tools shortcuts exist..."
|
|
|
|
$pinPaths = @()
|
|
foreach ($pin in $pinSpec) {
|
|
if (Test-Path -LiteralPath $pin.Literal) {
|
|
Write-Host " pin: $($pin.Name) -> $($pin.Literal)"
|
|
$pinPaths += $pin.Path
|
|
} else {
|
|
Write-Host " skip: $($pin.Name) - not found at $($pin.Literal)" -ForegroundColor DarkGray
|
|
}
|
|
}
|
|
|
|
if ($pinPaths.Count -eq 0) {
|
|
Write-Warning "No pins to apply (nothing found in Shopfloor Tools\). Did 06-OrganizeDesktop.ps1 run first?"
|
|
exit 0
|
|
}
|
|
|
|
# ============================================================================
|
|
# Write LayoutModification.xml
|
|
# ============================================================================
|
|
$pinXml = ($pinPaths | ForEach-Object {
|
|
" <taskbar:DesktopApp DesktopApplicationLinkPath=`"$_`"/>"
|
|
}) -join "`r`n"
|
|
|
|
$layoutXml = @"
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
<LayoutModificationTemplate
|
|
xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification"
|
|
xmlns:defaultlayout="http://schemas.microsoft.com/Start/2014/FullDefaultLayout"
|
|
xmlns:start="http://schemas.microsoft.com/Start/2014/StartLayout"
|
|
xmlns:taskbar="http://schemas.microsoft.com/Start/2014/TaskbarLayout"
|
|
Version="1">
|
|
<CustomTaskbarLayoutCollection PinListPlacement="Replace">
|
|
<defaultlayout:TaskbarLayout>
|
|
<taskbar:TaskbarPinList>
|
|
$pinXml
|
|
</taskbar:TaskbarPinList>
|
|
</defaultlayout:TaskbarLayout>
|
|
</CustomTaskbarLayoutCollection>
|
|
</LayoutModificationTemplate>
|
|
"@
|
|
|
|
try {
|
|
if (-not (Test-Path -LiteralPath $defaultUserShell)) {
|
|
New-Item -ItemType Directory -Path $defaultUserShell -Force -ErrorAction Stop | Out-Null
|
|
}
|
|
# -ErrorAction Stop so Access Denied becomes a catchable terminating error
|
|
# instead of silently falling through to the success message.
|
|
Set-Content -LiteralPath $layoutXmlPath -Value $layoutXml -Encoding UTF8 -Force -ErrorAction Stop
|
|
Write-Host ""
|
|
Write-Host "Wrote taskbar layout with $($pinPaths.Count) pin(s) to:"
|
|
Write-Host " $layoutXmlPath"
|
|
Write-Host ""
|
|
Write-Host "Pins will apply on first logon of any NEW user profile."
|
|
} catch {
|
|
Write-Warning "Failed to write $layoutXmlPath : $_"
|
|
exit 1
|
|
}
|
|
|
|
exit 0
|