images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-01-10 16:29:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

stop ssh agent only if building vendors

Browse Source
This commit is contained in:
David Refoua 2022-10-17 19:52:15 +03:30
parent 7995f34981
commit 71536ddddf
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/build.ps1
View File

@ -53,7 +53,7 @@ Param(
# Config folder location
[string]$config = "$PSScriptRoot\..\config",
# Using this option will skip all downloads and only build launcher
# Using this option will skip all downloads, if you only need to build launcher
[switch]$noVendor,
# Build launcher if you have MSBuild tools installed
@ -67,14 +67,6 @@ $cmder_root = Resolve-Path "$PSScriptRoot\.."
. "$PSScriptRoot\utils.ps1"
$ErrorActionPreference = "Stop"
# Kill ssh-agent.exe if it is running from the $env:cmder_root we are building
foreach ($ssh_agent in $(Get-Process ssh-agent -ErrorAction SilentlyContinue)) {
if ([string]$($ssh_agent.path) -Match [string]$cmder_root.replace('\','\\')) {
Write-Verbose $("Stopping " + $ssh_agent.path + "!")
Stop-Process $ssh_agent.id
}
}
if ($Compile) {
# Check for requirements
Ensure-Executable "msbuild"
@ -119,6 +111,14 @@ if (-Not $noVendor) {
} else { $ConEmuXml = "" }
} else { $ConEmuXml = "" }
# Kill ssh-agent.exe if it is running from the $env:cmder_root we are building
foreach ($ssh_agent in $(Get-Process ssh-agent -ErrorAction SilentlyContinue)) {
if ([string]$($ssh_agent.path) -Match [string]$cmder_root.replace('\','\\')) {
Write-Verbose $("Stopping " + $ssh_agent.path + "!")
Stop-Process $ssh_agent.id
}
}
foreach ($s in $sources) {
Write-Verbose "Getting vendored $($s.name) $($s.version)..."

2
scripts/utils.ps1
View File

@ -92,7 +92,7 @@ function Get-GHTempPath {
return $temp
}
function Get-VersionStr() {
function Get-VersionStr {
# Clear existing variable
if ($string) { Clear-Variable -name string }