0badfc1983
Stage 2a (GE-Enforce.ps1, landed 2026-04-22) is now the only ongoing-update
enforcer. The legacy per-pctype tasks (Machine-Enforce, Common-Enforce,
CMM-Enforce, Keyence-Enforce, Acrobat-Enforce) were kept as transition
belt-and-suspenders; with retrofitted PCs handled, the v1 path is dead and
gets removed entirely.
Deleted (13 files):
Standard/{Machine-Enforce,Register-MachineEnforce}.ps1
Standard/machineapps-manifest.template.json
common/{Common-Enforce,Acrobat-Enforce,Register-CommonEnforce,Register-AcrobatEnforce}.ps1
common/common-apps-manifest.template.json
CMM/CMM-Enforce.ps1
Keyence/Keyence-Enforce.ps1
{CMM,Keyence,Standard}/lib/Install-FromManifest.ps1 (orphan dups of common/lib)
Trimmed:
Run-ShopfloorSetup.ps1: dropped the legacy register-* invocations (Common,
Machine) and the transition-period comment. Sole enforcer registration
is now Register-GEEnforce.
09-Setup-Keyence.ps1: keeps imaging-time install (step 1); removes the
enforcer staging (step 2) and scheduled-task registration (step 3).
Library lookup repointed to common/lib/Install-FromManifest.ps1.
09-Setup-CMM.ps1: same treatment - keeps .NET 3.5 enable, install,
PC-DMIS ACL grants, and bootstrap cleanup. Library repointed to common/lib.
cmm-manifest.json + keyence-manifest.json: _comment fields updated to
reflect imaging-time-only role (ongoing enforcement now goes through
the v2 share manifests via GE-Enforce).
Verified clean: no orphan references to *-Enforce.ps1 / Register-*Enforce.ps1
/ machineapps-manifest / common-apps-manifest in any code path that runs.
A few historical mentions remain in unmodified header comments (GE-Enforce.ps1,
Deploy-GEEnforce.ps1, Monitor-IntuneProgress.ps1) describing what the new
dispatcher replaced; left as historical context.
Run-ShopfloorSetup.ps1 also picks up an unrelated 1-line hunk adding
SetShopfloorAutoLogon.bat to the desktop-copy list (already in the working
tree from a prior session). The file itself is not yet tracked; the
desktop-copy step is Test-Path-guarded so this is harmless until the
.bat is committed.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
77 lines
3.3 KiB
PowerShell
77 lines
3.3 KiB
PowerShell
# 09-Setup-Keyence.ps1 - Keyence type setup (runs during shopfloor-setup phase).
|
|
#
|
|
# Performs the imaging-time install of Keyence VR-6000 Series Software MSI +
|
|
# KEYENCE VR Series USB driver from the staged bundle. Ongoing enforcement
|
|
# is handled by GE-Enforce (registered separately in Run-ShopfloorSetup.ps1)
|
|
# reading keyence/manifest.json from the tsgwp00525 share.
|
|
#
|
|
# Layout at $PSScriptRoot (xcopied by startnet.cmd only for PCTYPE=Keyence):
|
|
# keyence-manifest.json
|
|
# 09-Setup-Keyence.ps1 (this file)
|
|
# installers\VR-6000 Series Software.msi
|
|
# drivers\keyence_vr_series.inf (+ cat + amd64\{Wdf,WinUsb}CoInstaller*.dll)
|
|
#
|
|
# Library lookup: the imaging-time install uses the common Install-FromManifest
|
|
# library at ..\common\lib\Install-FromManifest.ps1 (relative to $PSScriptRoot).
|
|
#
|
|
# Log: C:\Logs\Keyence\09-Setup-Keyence.log
|
|
# C:\Logs\Keyence\install.log (written by Install-FromManifest)
|
|
|
|
$ErrorActionPreference = 'Continue'
|
|
|
|
$manifestPath = Join-Path $PSScriptRoot 'keyence-manifest.json'
|
|
$libSource = Join-Path $PSScriptRoot '..\common\lib\Install-FromManifest.ps1'
|
|
|
|
$logDir = 'C:\Logs\Keyence'
|
|
$installLog = Join-Path $logDir 'install.log'
|
|
$transcriptLog = Join-Path $logDir '09-Setup-Keyence.log'
|
|
|
|
if (-not (Test-Path $logDir)) {
|
|
New-Item -Path $logDir -ItemType Directory -Force | Out-Null
|
|
}
|
|
|
|
try { Start-Transcript -Path $transcriptLog -Append -Force | Out-Null } catch {}
|
|
|
|
function Write-KeyenceLog {
|
|
param([string]$Message, [string]$Level = 'INFO')
|
|
$stamp = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
|
|
Write-Host "[$stamp] [$Level] $Message"
|
|
}
|
|
|
|
Write-KeyenceLog "================================================================"
|
|
Write-KeyenceLog "=== Keyence Setup (imaging-time) session start (PID $PID) ==="
|
|
Write-KeyenceLog "Running as: $([System.Security.Principal.WindowsIdentity]::GetCurrent().Name)"
|
|
Write-KeyenceLog "Script root: $PSScriptRoot"
|
|
Write-KeyenceLog "================================================================"
|
|
|
|
# Diagnostic dump
|
|
foreach ($file in @('pc-type.txt','pc-subtype.txt','machine-number.txt')) {
|
|
$path = "C:\Enrollment\$file"
|
|
if (Test-Path -LiteralPath $path) {
|
|
$content = (Get-Content -LiteralPath $path -First 1 -ErrorAction SilentlyContinue).Trim()
|
|
Write-KeyenceLog " $file = $content"
|
|
} else {
|
|
Write-KeyenceLog " $file = (not present)"
|
|
}
|
|
}
|
|
|
|
# ============================================================================
|
|
# Step 1: Install via manifest (imaging-time)
|
|
# ============================================================================
|
|
if (-not (Test-Path $manifestPath)) {
|
|
Write-KeyenceLog "keyence-manifest.json not found at $manifestPath" "ERROR"
|
|
} elseif (-not (Test-Path $libSource)) {
|
|
Write-KeyenceLog "Install-FromManifest.ps1 not found at $libSource" "ERROR"
|
|
} else {
|
|
Write-KeyenceLog "Running Install-FromManifest (InstallerRoot=$PSScriptRoot)"
|
|
& $libSource -ManifestPath $manifestPath -InstallerRoot $PSScriptRoot -LogFile $installLog
|
|
$rc = $LASTEXITCODE
|
|
Write-KeyenceLog "Install-FromManifest returned $rc"
|
|
}
|
|
|
|
Write-KeyenceLog "================================================================"
|
|
Write-KeyenceLog "=== Keyence Setup session end ==="
|
|
Write-KeyenceLog "================================================================"
|
|
|
|
try { Stop-Transcript | Out-Null } catch {}
|