diff --git a/playbook/shopfloor-setup/gea-shopfloor-collections/01-eDNC.ps1 b/playbook/shopfloor-setup/gea-shopfloor-collections/01-eDNC.ps1 index f6e7c42..1446308 100644 --- a/playbook/shopfloor-setup/gea-shopfloor-collections/01-eDNC.ps1 +++ b/playbook/shopfloor-setup/gea-shopfloor-collections/01-eDNC.ps1 @@ -45,11 +45,19 @@ if (-not (Test-Path $edncDir)) { } # --- Find installer --- -# Filter is eDNC*.msi (no dash) so we match both vendor naming styles: -# eDNC-6.4.3.msi (dash) and eDNC_6-4-5.msi (underscore). Imaging dir should -# only contain ONE version at a time; rollback to a prior version is handled -# post-imaging via the SFLD share's standard-machine/apps/ alternates. -$edncMsi = Get-ChildItem -Path $edncDir -Filter "eDNC*.msi" | Select-Object -First 1 +# Default DNC install is the single shared copy staged by startnet.cmd to +# C:\PreInstall\installers\dnc (currently eDNC-6.4.7.msi) - one source of truth +# across every DNC pc-type instead of a per-type msi. Fall back to the per-type +# eDNC\ folder for older images that still bundle their own. Filter is eDNC*.msi +# (no dash) so both vendor naming styles match: eDNC-6.4.7.msi and eDNC_6-4-5.msi. +$sharedDncDir = 'C:\PreInstall\installers\dnc' +$edncMsi = Get-ChildItem -Path $sharedDncDir -Filter "eDNC*.msi" -ErrorAction SilentlyContinue | Select-Object -First 1 +if ($edncMsi) { + Write-Host "Using shared DNC installer: $($edncMsi.FullName)" +} else { + $edncMsi = Get-ChildItem -Path $edncDir -Filter "eDNC*.msi" -ErrorAction SilentlyContinue | Select-Object -First 1 + if ($edncMsi) { Write-Host "Shared DNC installer not found - falling back to per-type: $($edncMsi.FullName)" } +} $emxInfo = Join-Path $edncDir "eMxInfo.txt" # --- 1. Install eDNC --- diff --git a/playbook/shopfloor-setup/gea-shopfloor-heattreat/01-eDNC.ps1 b/playbook/shopfloor-setup/gea-shopfloor-heattreat/01-eDNC.ps1 index f6e7c42..1446308 100644 --- a/playbook/shopfloor-setup/gea-shopfloor-heattreat/01-eDNC.ps1 +++ b/playbook/shopfloor-setup/gea-shopfloor-heattreat/01-eDNC.ps1 @@ -45,11 +45,19 @@ if (-not (Test-Path $edncDir)) { } # --- Find installer --- -# Filter is eDNC*.msi (no dash) so we match both vendor naming styles: -# eDNC-6.4.3.msi (dash) and eDNC_6-4-5.msi (underscore). Imaging dir should -# only contain ONE version at a time; rollback to a prior version is handled -# post-imaging via the SFLD share's standard-machine/apps/ alternates. -$edncMsi = Get-ChildItem -Path $edncDir -Filter "eDNC*.msi" | Select-Object -First 1 +# Default DNC install is the single shared copy staged by startnet.cmd to +# C:\PreInstall\installers\dnc (currently eDNC-6.4.7.msi) - one source of truth +# across every DNC pc-type instead of a per-type msi. Fall back to the per-type +# eDNC\ folder for older images that still bundle their own. Filter is eDNC*.msi +# (no dash) so both vendor naming styles match: eDNC-6.4.7.msi and eDNC_6-4-5.msi. +$sharedDncDir = 'C:\PreInstall\installers\dnc' +$edncMsi = Get-ChildItem -Path $sharedDncDir -Filter "eDNC*.msi" -ErrorAction SilentlyContinue | Select-Object -First 1 +if ($edncMsi) { + Write-Host "Using shared DNC installer: $($edncMsi.FullName)" +} else { + $edncMsi = Get-ChildItem -Path $edncDir -Filter "eDNC*.msi" -ErrorAction SilentlyContinue | Select-Object -First 1 + if ($edncMsi) { Write-Host "Shared DNC installer not found - falling back to per-type: $($edncMsi.FullName)" } +} $emxInfo = Join-Path $edncDir "eMxInfo.txt" # --- 1. Install eDNC --- diff --git a/playbook/shopfloor-setup/gea-shopfloor-nocollections/01-eDNC.ps1 b/playbook/shopfloor-setup/gea-shopfloor-nocollections/01-eDNC.ps1 index f6e7c42..1446308 100644 --- a/playbook/shopfloor-setup/gea-shopfloor-nocollections/01-eDNC.ps1 +++ b/playbook/shopfloor-setup/gea-shopfloor-nocollections/01-eDNC.ps1 @@ -45,11 +45,19 @@ if (-not (Test-Path $edncDir)) { } # --- Find installer --- -# Filter is eDNC*.msi (no dash) so we match both vendor naming styles: -# eDNC-6.4.3.msi (dash) and eDNC_6-4-5.msi (underscore). Imaging dir should -# only contain ONE version at a time; rollback to a prior version is handled -# post-imaging via the SFLD share's standard-machine/apps/ alternates. -$edncMsi = Get-ChildItem -Path $edncDir -Filter "eDNC*.msi" | Select-Object -First 1 +# Default DNC install is the single shared copy staged by startnet.cmd to +# C:\PreInstall\installers\dnc (currently eDNC-6.4.7.msi) - one source of truth +# across every DNC pc-type instead of a per-type msi. Fall back to the per-type +# eDNC\ folder for older images that still bundle their own. Filter is eDNC*.msi +# (no dash) so both vendor naming styles match: eDNC-6.4.7.msi and eDNC_6-4-5.msi. +$sharedDncDir = 'C:\PreInstall\installers\dnc' +$edncMsi = Get-ChildItem -Path $sharedDncDir -Filter "eDNC*.msi" -ErrorAction SilentlyContinue | Select-Object -First 1 +if ($edncMsi) { + Write-Host "Using shared DNC installer: $($edncMsi.FullName)" +} else { + $edncMsi = Get-ChildItem -Path $edncDir -Filter "eDNC*.msi" -ErrorAction SilentlyContinue | Select-Object -First 1 + if ($edncMsi) { Write-Host "Shared DNC installer not found - falling back to per-type: $($edncMsi.FullName)" } +} $emxInfo = Join-Path $edncDir "eMxInfo.txt" # --- 1. Install eDNC --- diff --git a/playbook/shopfloor-setup/gea-shopfloor-partmarker/01-eDNC.ps1 b/playbook/shopfloor-setup/gea-shopfloor-partmarker/01-eDNC.ps1 index f6e7c42..1446308 100644 --- a/playbook/shopfloor-setup/gea-shopfloor-partmarker/01-eDNC.ps1 +++ b/playbook/shopfloor-setup/gea-shopfloor-partmarker/01-eDNC.ps1 @@ -45,11 +45,19 @@ if (-not (Test-Path $edncDir)) { } # --- Find installer --- -# Filter is eDNC*.msi (no dash) so we match both vendor naming styles: -# eDNC-6.4.3.msi (dash) and eDNC_6-4-5.msi (underscore). Imaging dir should -# only contain ONE version at a time; rollback to a prior version is handled -# post-imaging via the SFLD share's standard-machine/apps/ alternates. -$edncMsi = Get-ChildItem -Path $edncDir -Filter "eDNC*.msi" | Select-Object -First 1 +# Default DNC install is the single shared copy staged by startnet.cmd to +# C:\PreInstall\installers\dnc (currently eDNC-6.4.7.msi) - one source of truth +# across every DNC pc-type instead of a per-type msi. Fall back to the per-type +# eDNC\ folder for older images that still bundle their own. Filter is eDNC*.msi +# (no dash) so both vendor naming styles match: eDNC-6.4.7.msi and eDNC_6-4-5.msi. +$sharedDncDir = 'C:\PreInstall\installers\dnc' +$edncMsi = Get-ChildItem -Path $sharedDncDir -Filter "eDNC*.msi" -ErrorAction SilentlyContinue | Select-Object -First 1 +if ($edncMsi) { + Write-Host "Using shared DNC installer: $($edncMsi.FullName)" +} else { + $edncMsi = Get-ChildItem -Path $edncDir -Filter "eDNC*.msi" -ErrorAction SilentlyContinue | Select-Object -First 1 + if ($edncMsi) { Write-Host "Shared DNC installer not found - falling back to per-type: $($edncMsi.FullName)" } +} $emxInfo = Join-Path $edncDir "eMxInfo.txt" # --- 1. Install eDNC ---