beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #935 from leafnode/upstream

Browse source 
check if ssh-agent really exists
This commit is contained in:
Hylke Bons 2012-08-27 06:04:31 -07:00
parent f6dc8fb3bb ec36a89fd2
commit 4fdb65b2f3
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
SparkleShare/Windows/SparkleController.cs
View file

@ -191,11 +191,21 @@ namespace SparkleShare {
private void StartSSH ()
{
string auth_sock = Environment.GetEnvironmentVariable ("SSH_AUTH_SOCK");
string auth_agent_pid = Environment.GetEnvironmentVariable("SSH_AGENT_PID");
if (!string.IsNullOrEmpty (auth_sock)) {
SparkleLogger.LogInfo ("Controller", "Using existing ssh-agent with PID=" + this.ssh_agent_pid);
return;
if (!string.IsNullOrEmpty (auth_agent_pid)) {
SparkleLogger.LogInfo("Controller", "Trying existing ssh-agent with PID=" + auth_agent_pid);
this.ssh_agent_pid = Convert.ToInt32(auth_agent_pid);
try
{
Process ssh_agent = Process.GetProcessById(this.ssh_agent_pid);
SparkleLogger.LogInfo("Controller", "Using existing ssh-agent with PID=" + this.ssh_agent_pid);
return;
}
catch (ArgumentException e)
{
SparkleLogger.LogInfo("Controller", "ssh-agent with PID=" + auth_agent_pid + " does not exist. Starting a new one");
}
}
Process process = new Process ();
@ -213,7 +223,7 @@ namespace SparkleShare {
Match ssh_pid_match = new Regex (@"SSH_AGENT_PID=([^;\n\r]*)").Match (output);
if (auth_sock_match.Success)
Environment.SetEnvironmentVariable ("SSH_AUTH_SOCK", auth_sock_match.Groups [1].Value);
Environment.SetEnvironmentVariable("SSH_AUTH_SOCK", auth_sock_match.Groups[1].Value);
if (ssh_pid_match.Success) {
string ssh_pid = ssh_pid_match.Groups [1].Value;