Permalink
Browse files

added kill ssh-agent to build.ps1

  • Loading branch information...
1 parent 393d7d1 commit 13c474b7686b5e1fd6c5b21b105197a0da6c823d @daxgames daxgames committed Jul 17, 2016
Showing with 13 additions and 0 deletions.
  1. +12 −0 scripts/build.ps1
  2. +1 −0 scripts/utils.ps1
View
@@ -53,6 +53,10 @@ Param(
[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
. ".\utils.ps1"
$ErrorActionPreference = "Stop"
@@ -75,6 +79,14 @@ if ($config -ne "") {
} 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
foreach ($s in $sources) {
Write-Verbose "Getting $($s.name) from URL $($s.url)"
View
@@ -28,6 +28,7 @@ function Delete-Existing ($path) {
}
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"
if ($lastexitcode -ne 0) {
Write-Error "Extracting of $source failied"

0 comments on commit 13c474b

Please sign in to comment.