Skip to content

Commit 6108ab6

Browse files
committed
Address Devin comments
1 parent c112d48 commit 6108ab6

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

Build/Agent/Setup-InstallerBuild.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ Write-Host "`n--- Checking Helper Repositories ---" -ForegroundColor Yellow
176176
$helperRepos = @(
177177
@{ Name = "FwHelps"; Path = "DistFiles/Helps" },
178178
@{ Name = "FwLocalizations"; Path = "Localizations" },
179+
@{ Name = "genericinstaller"; Path = "PatchableInstaller" },
179180
@{ Name = "liblcm"; Path = "Localizations/LCMRepo" }
180181
)
181182

@@ -198,7 +199,7 @@ foreach ($repo in $helperRepos) {
198199
} else {
199200
Write-Host "[MISSING] $($repo.Name): $displayPath" -ForegroundColor Red
200201
$missingRepos += $repo
201-
if ($repo.Name -eq 'liblcm') {
202+
if ($repo.Name -eq 'liblcm' -and $env:LcmRootDir) {
202203
$issues += "Missing helper repository: $($repo.Name) (expected at LcmRootDir=$env:LcmRootDir)"
203204
} else {
204205
$issues += "Missing helper repository: $($repo.Name)"

Setup-Developer-Machine.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ if ($InstallerDeps) {
205205
# Special case: liblcm is found via the LcmRootDir environment variable
206206
$localizationsPath = Join-Path $scriptDir "Localizations"
207207
$lcmTarget = Join-Path $localizationsPath "LCMRepo"
208-
if ($env:LcmRootDir -and (Test-Path Join-Path $env:LcmRootDir ".git")) {
208+
if ($env:LcmRootDir -and (Test-Path (Join-Path $env:LcmRootDir ".git"))) {
209209
Write-Host "[OK] liblcm already exists at $env:LcmRootDir" -ForegroundColor Green
210210
} elseif (Test-Path $lcmTarget) {
211211
$env:LcmRootDir = $lcmTarget
@@ -290,7 +290,7 @@ $env:PATH = [Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [En
290290

291291
Write-Host "`n--- Configuring Environment Variables ---" -ForegroundColor Yellow
292292

293-
if ($env:LcmRootDir -and (Test-Path Join-Path $env:LcmRootDir ".git") -and
293+
if ($env:LcmRootDir -and (Test-Path (Join-Path $env:LcmRootDir ".git")) -and
294294
$PSCmdlet.ShouldProcess('LcmRootDir', 'Set LcmRootDir for the current user')) {
295295
[Environment]::SetEnvironmentVariable('LcmRootDir', $env:LcmRootDir, 'User')
296296
}

0 commit comments

Comments
 (0)