Merge branch 'tortoise'
Conflicts: SparkleLib/Git/SparkleGit.cs SparkleLib/SparkleFetcherSSH.cs SparkleShare/SparkleControllerBase.cs
This commit is contained in:
commit
2d1f7d3f8c
|
@ -103,6 +103,7 @@ namespace SparkleLib.Git {
|
|||
|
||||
public static string ExecPath;
|
||||
public static string GitPath;
|
||||
public static string SSHPath;
|
||||
|
||||
|
||||
public SparkleGit (string path, string args) : base (path, args)
|
||||
|
@ -122,6 +123,13 @@ namespace SparkleLib.Git {
|
|||
else
|
||||
StartInfo.EnvironmentVariables.Add ("LANG", "en_US");
|
||||
|
||||
if (!string.IsNullOrEmpty (SSHPath)) {
|
||||
if (StartInfo.EnvironmentVariables.ContainsKey ("GIT_SSH"))
|
||||
StartInfo.EnvironmentVariables ["GIT_SSH"] = SSHPath;
|
||||
else
|
||||
StartInfo.EnvironmentVariables.Add ("GIT_SSH", SSHPath);
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty (ExecPath))
|
||||
StartInfo.Arguments = args;
|
||||
else
|
||||
|
|
|
@ -26,8 +26,9 @@ namespace SparkleLib {
|
|||
|
||||
public class SparkleFetcherInfo {
|
||||
public string Address;
|
||||
public string Fingerprint;
|
||||
public string RemotePath;
|
||||
public string Backend;
|
||||
public string Fingerprint;
|
||||
public string TargetDirectory;
|
||||
public string AnnouncementsUrl;
|
||||
public bool FetchPriorHistory;
|
||||
|
|
|
@ -47,7 +47,6 @@ namespace SparkleLib {
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
if (host_fingerprint == null || !RequiredFingerprint.Equals (host_fingerprint)) {
|
||||
SparkleLogger.LogInfo ("Auth", "Fingerprint doesn't match");
|
||||
this.errors.Add ("error: Host fingerprint doesn't match");
|
||||
|
|
|
@ -527,7 +527,11 @@ namespace SparkleShare {
|
|||
}
|
||||
|
||||
string canonical_name = Path.GetFileName (info.RemotePath);
|
||||
string backend = SparkleFetcherBase.GetBackend (info.Address);
|
||||
string backend = info.Backend;
|
||||
|
||||
if (string.IsNullOrEmpty (backend))
|
||||
backend = SparkleFetcherBase.GetBackend (info.Address);
|
||||
|
||||
info.TargetDirectory = Path.Combine (tmp_path, canonical_name);
|
||||
|
||||
try {
|
||||
|
|
|
@ -356,7 +356,8 @@ namespace SparkleShare {
|
|||
Fingerprint = SelectedPlugin.Fingerprint,
|
||||
RemotePath = remote_path,
|
||||
FetchPriorHistory = this.fetch_prior_history,
|
||||
AnnouncementsUrl = SelectedPlugin.AnnouncementsUrl
|
||||
AnnouncementsUrl = SelectedPlugin.AnnouncementsUrl,
|
||||
Backend = SelectedPlugin.Backend
|
||||
};
|
||||
|
||||
new Thread (() => { Program.Controller.StartFetcher (info); }).Start ();
|
||||
|
|
|
@ -30,6 +30,7 @@ using Microsoft.Win32;
|
|||
using SparkleLib;
|
||||
using System.Windows;
|
||||
|
||||
|
||||
namespace SparkleShare {
|
||||
|
||||
public class SparkleController : SparkleControllerBase {
|
||||
|
@ -57,6 +58,7 @@ namespace SparkleShare {
|
|||
string executable_path = Path.GetDirectoryName (Forms.Application.ExecutablePath);
|
||||
string msysgit_path = Path.Combine (executable_path, "msysgit");
|
||||
|
||||
|
||||
string new_PATH = msysgit_path + @"\bin" + ";" +
|
||||
msysgit_path + @"\mingw\bin" + ";" +
|
||||
msysgit_path + @"\cmd" + ";" +
|
||||
|
@ -66,6 +68,8 @@ namespace SparkleShare {
|
|||
Environment.SetEnvironmentVariable ("HOME", Environment.GetFolderPath (Environment.SpecialFolder.UserProfile));
|
||||
|
||||
StartSSH ();
|
||||
SparkleLib.SparkleGit.SparkleGit.SSHPath = Path.Combine (msysgit_path, "bin", "ssh.exe");
|
||||
|
||||
base.Initialize ();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue