windows: explicitly point GIT_SSH to ssh.exe
This commit is contained in:
parent
825707f1a7
commit
aa6b6e21ec
|
@ -103,6 +103,7 @@ namespace SparkleLib.Git {
|
||||||
|
|
||||||
public static string ExecPath;
|
public static string ExecPath;
|
||||||
public static string GitPath;
|
public static string GitPath;
|
||||||
|
public static string SSHPath;
|
||||||
|
|
||||||
|
|
||||||
public SparkleGit (string path, string args) : base (path, args)
|
public SparkleGit (string path, string args) : base (path, args)
|
||||||
|
@ -117,6 +118,9 @@ namespace SparkleLib.Git {
|
||||||
StartInfo.WorkingDirectory = path;
|
StartInfo.WorkingDirectory = path;
|
||||||
StartInfo.CreateNoWindow = true;
|
StartInfo.CreateNoWindow = true;
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty (SSHPath))
|
||||||
|
StartInfo.EnvironmentVariables.Add ("GIT_SSH", SSHPath);
|
||||||
|
|
||||||
if (string.IsNullOrEmpty (ExecPath))
|
if (string.IsNullOrEmpty (ExecPath))
|
||||||
StartInfo.Arguments = args;
|
StartInfo.Arguments = args;
|
||||||
else
|
else
|
||||||
|
|
|
@ -29,6 +29,7 @@ using Forms = System.Windows.Forms;
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
using SparkleLib;
|
using SparkleLib;
|
||||||
|
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
|
||||||
public class SparkleController : SparkleControllerBase {
|
public class SparkleController : SparkleControllerBase {
|
||||||
|
@ -56,6 +57,7 @@ namespace SparkleShare {
|
||||||
string executable_path = Path.GetDirectoryName (Forms.Application.ExecutablePath);
|
string executable_path = Path.GetDirectoryName (Forms.Application.ExecutablePath);
|
||||||
string msysgit_path = Path.Combine (executable_path, "msysgit");
|
string msysgit_path = Path.Combine (executable_path, "msysgit");
|
||||||
|
|
||||||
|
|
||||||
string new_PATH = msysgit_path + @"\bin" + ";" +
|
string new_PATH = msysgit_path + @"\bin" + ";" +
|
||||||
msysgit_path + @"\mingw\bin" + ";" +
|
msysgit_path + @"\mingw\bin" + ";" +
|
||||||
msysgit_path + @"\cmd" + ";" +
|
msysgit_path + @"\cmd" + ";" +
|
||||||
|
@ -65,6 +67,8 @@ namespace SparkleShare {
|
||||||
Environment.SetEnvironmentVariable ("HOME", Environment.GetFolderPath (Environment.SpecialFolder.UserProfile));
|
Environment.SetEnvironmentVariable ("HOME", Environment.GetFolderPath (Environment.SpecialFolder.UserProfile));
|
||||||
|
|
||||||
StartSSH ();
|
StartSSH ();
|
||||||
|
SparkleLib.Git.SparkleGit.SSHPath = Path.Combine (msysgit_path, "ssh.exe");
|
||||||
|
|
||||||
base.Initialize ();
|
base.Initialize ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue