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

Add Git version to logs

Browse source
This commit is contained in:
Hylke Bons 2016-03-30 21:43:19 +01:00
parent 5ff930300f
commit 65b2b4b3b6
4 changed files with 40 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
SparkleLib/Git/SparkleGit.cs
View file

@ -19,17 +19,25 @@ namespace SparkleLib.Git {
public class SparkleGit : SparkleProcess { public class SparkleGit : SparkleProcess {
public static string ExecPath;
public static string GitPath;
public static string SSHPath; public static string SSHPath;
public static string GitPath;
public static string ExecPath;
public static string GitVersion {
get {
string git_version = new SparkleProcess (GitPath, "--version").StartAndReadStandardOutput ();
return git_version.Replace ("git version ", "");
}
}
public SparkleGit (string path, string args) : base (path, args) public SparkleGit (string path, string args) : base (path, args)
{ {
if (string.IsNullOrEmpty (GitPath)) if (GitPath == null)
GitPath = LocateCommand ("git"); GitPath = LocateCommand ("git");
StartInfo.FileName = GitPath; StartInfo.FileName = GitPath;
StartInfo.WorkingDirectory = path; StartInfo.WorkingDirectory = path;
if (string.IsNullOrEmpty (SSHPath)) if (string.IsNullOrEmpty (SSHPath))
@ -41,7 +49,7 @@ namespace SparkleLib.Git {
"-o PasswordAuthentication=no " + "-o PasswordAuthentication=no " +
"-F /dev/null"; // Ignore the environment's SSH config file "-F /dev/null"; // Ignore the environment's SSH config file
if (!string.IsNullOrEmpty (ExecPath)) if (ExecPath == null)
SetEnvironmentVariable ("GIT_EXEC_PATH", ExecPath); SetEnvironmentVariable ("GIT_EXEC_PATH", ExecPath);
SetEnvironmentVariable ("GIT_SSH_COMMAND", GIT_SSH_COMMAND); SetEnvironmentVariable ("GIT_SSH_COMMAND", GIT_SSH_COMMAND);

28
SparkleLib/SparkleProcess.cs
View file

@ -23,14 +23,25 @@ namespace SparkleLib {
public class SparkleProcess : Process { public class SparkleProcess : Process {
public SparkleProcess (string path, string args) { bool write_output;
StartInfo.FileName = path;
StartInfo.Arguments = args;
StartInfo.UseShellExecute = false; public SparkleProcess (string path, string args) : this (path, args, false)
{
}
public SparkleProcess (string path, string args, bool write_output)
{
this.write_output = write_output;
StartInfo.FileName = path;
StartInfo.Arguments = args;
StartInfo.UseShellExecute = false;
StartInfo.RedirectStandardOutput = true; StartInfo.RedirectStandardOutput = true;
StartInfo.RedirectStandardError = true; StartInfo.RedirectStandardError = true;
StartInfo.CreateNoWindow = true; StartInfo.CreateNoWindow = true;
EnableRaisingEvents = true; EnableRaisingEvents = true;
} }
@ -41,7 +52,8 @@ namespace SparkleLib {
if (!string.IsNullOrEmpty (StartInfo.WorkingDirectory)) if (!string.IsNullOrEmpty (StartInfo.WorkingDirectory))
folder = Path.GetFileName (StartInfo.WorkingDirectory) + " | "; folder = Path.GetFileName (StartInfo.WorkingDirectory) + " | ";
SparkleLogger.LogInfo ("Cmd", folder + Path.GetFileName (StartInfo.FileName) + " " + StartInfo.Arguments); if (this.write_output)
SparkleLogger.LogInfo ("Cmd", folder + Path.GetFileName (StartInfo.FileName) + " " + StartInfo.Arguments);
try { try {
base.Start (); base.Start ();

6
SparkleShare/Mac/SparkleController.cs
View file

@ -25,6 +25,7 @@ using MonoMac.Foundation;
using MonoMac.AppKit; using MonoMac.AppKit;
using SparkleLib; using SparkleLib;
using SparkleLib.Git;
namespace SparkleShare { namespace SparkleShare {
@ -41,9 +42,8 @@ namespace SparkleShare {
{ {
NSApplication.Init (); NSApplication.Init ();
// Let's use the bundled git first SparkleGit.GitPath = Path.Combine (NSBundle.MainBundle.ResourcePath, "git", "libexec", "git-core", "git");
SparkleLib.Git.SparkleGit.GitPath = Path.Combine (NSBundle.MainBundle.ResourcePath, "git", "libexec", "git-core", "git"); SparkleGit.ExecPath = Path.Combine (NSBundle.MainBundle.ResourcePath, "git", "libexec", "git-core");
SparkleLib.Git.SparkleGit.ExecPath = Path.Combine (NSBundle.MainBundle.ResourcePath, "git", "libexec", "git-core");
} }

7
SparkleShare/SparkleControllerBase.cs
View file

@ -22,6 +22,7 @@ using System.Linq;
using System.Threading; using System.Threading;
using SparkleLib; using SparkleLib;
using SparkleLib.Git;
namespace SparkleShare { namespace SparkleShare {
@ -211,9 +212,9 @@ namespace SparkleShare {
public virtual void Initialize () public virtual void Initialize ()
{ {
SparkleLogger.LogInfo ("Environment", SparkleLib.SparkleBackend.Platform + " (" + Environment.OSVersion + ")"); SparkleLogger.LogInfo ("Environment", "SparkleShare " + SparkleBackend.Version);
// TODO: SparkleLogger.LogInfo ("Environment", "Git version: "); SparkleLogger.LogInfo ("Environment", "Git " + SparkleGit.GitVersion);
SparkleLogger.LogInfo ("Environment", "SparkleShare " + SparkleLib.SparkleBackend.Version); SparkleLogger.LogInfo ("Environment", SparkleBackend.Platform + " (" + Environment.OSVersion + ")");
SparklePlugin.PluginsPath = PluginsPath; SparklePlugin.PluginsPath = PluginsPath;
InstallProtocolHandler (); InstallProtocolHandler ();