images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-02-11 07:59:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

added kill ssh-agent to build.ps1

Browse Source
This commit is contained in:
Dax T. Games 2016-07-17 18:28:38 -05:00
parent 393d7d19c5
commit 13c474b768
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/build.ps1
View File

@ -53,6 +53,10 @@ Param(
[switch]$Compile [switch]$Compile
) )
# Get the scripts and cmder root dirs we are building in.
$ScriptRoot = Split-Path -Parent -Path $MyInvocation.MyCommand.Definition
$cmder_root = $ScriptRoot.replace("\scripts","")
# Dot source util functions into this scope # Dot source util functions into this scope
. ".\utils.ps1" . ".\utils.ps1"
$ErrorActionPreference = "Stop" $ErrorActionPreference = "Stop"
@ -75,6 +79,14 @@ if ($config -ne "") {
} else { $ConEmuXml = "" } } else { $ConEmuXml = "" }
} 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
}
}
$vend = $pwd $vend = $pwd
foreach ($s in $sources) { foreach ($s in $sources) {
Write-Verbose "Getting $($s.name) from URL $($s.url)" Write-Verbose "Getting $($s.name) from URL $($s.url)"

1
scripts/utils.ps1
View File

@ -28,6 +28,7 @@ function Delete-Existing ($path) {
} }
function Extract-Archive ($source, $target) { function Extract-Archive ($source, $target) {
Write-Verbose $("Extracting Archive '$cmder_root\vendor\" + $source.replace('/','\') + " to '$cmder_root\vendor\$target'")
Invoke-Expression "7z x -y -o`"$($target)`" `"$source`" > `$null" Invoke-Expression "7z x -y -o`"$($target)`" `"$source`" > `$null"
if ($lastexitcode -ne 0) { if ($lastexitcode -ne 0) {
Write-Error "Extracting of $source failied" Write-Error "Extracting of $source failied"