Sync eng/common directory with azure-sdk-tools for PR 11353 (#6671)

* Handle tool/directory copy better

* Use /usr/bin/env instead of /bin/env

* Append additional newline

---------

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
This commit is contained in:
Azure SDK Bot 2025-07-25 14:12:48 -07:00 committed by GitHub
parent 028ad6af17
commit 9bfc124a87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 7 deletions

View File

@ -1,4 +1,4 @@
#!/bin/env pwsh
#!/usr/bin/env pwsh
#Requires -Version 7.0
#Requires -PSEdition Core
@ -61,11 +61,14 @@ $tempExe = Install-Standalone-Tool `
-Directory $tempInstallDirectory `
-Repository $Repository
Copy-Item -Path $tempExe -Destination $toolInstallDirectory -Force
if (-not (Test-Path $toolInstallDirectory)) {
New-Item -ItemType Directory -Path $toolInstallDirectory -Force | Out-Null
}
$exeName = Split-Path $tempExe -Leaf
$exe = Join-Path $toolInstallDirectory $exeName
$exeDestination = Join-Path $toolInstallDirectory $exeName
Copy-Item -Path $tempExe -Destination $exeDestination -Force
Write-Host "Package $package is installed at $exe"
Write-Host "Package $package is installed at $exeDestination"
if (!$UpdatePathInProfile) {
Write-Warning "To add the tool to PATH for new shell sessions, re-run with -UpdatePathInProfile to modify the shell profile file."
} else {
@ -74,5 +77,5 @@ if (!$UpdatePathInProfile) {
}
if ($Run) {
Start-Process -WorkingDirectory $RunDirectory -FilePath $exe -ArgumentList 'start' -NoNewWindow -Wait
Start-Process -WorkingDirectory $RunDirectory -FilePath $exeDestination -ArgumentList 'start' -NoNewWindow -Wait
}

View File

@ -247,6 +247,6 @@ function Add-InstallDirectoryToPathInProfile(
if (!$configContent -or !$configContent.Contains($markerComment)) {
Write-Host "Adding installation to PATH in shell profile at '$configFile'"
Add-Content -Path $configFile -Value $pathCommand
Add-Content -Path $configFile -Value ([Environment]::NewLine + $pathCommand)
}
}
}