michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor: detect terminal before it is needed

Browse source
This commit is contained in:
leo 2024-08-20 21:05:20 +08:00
parent f4f5ae7430
commit 04a187203a
No known key found for this signature in database
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Native/MacOS.cs
View file

@ -14,15 +14,10 @@ namespace SourceGit.Native
{ {
enum TerminalType enum TerminalType
{ {
Terminal, Default,
iTerm2, iTerm2,
} }
public MacOS()
{
_terminal = Directory.Exists("/Applications/iTerm.app") ? TerminalType.iTerm2 : TerminalType.Terminal;
}
public void SetupApp(AppBuilder builder) public void SetupApp(AppBuilder builder)
{ {
builder.With(new MacOSPlatformOptions() builder.With(new MacOSPlatformOptions()
@ -33,7 +28,6 @@ namespace SourceGit.Native
public string FindGitExecutable() public string FindGitExecutable()
{ {
// XCode built-in git
return File.Exists("/usr/bin/git") ? "/usr/bin/git" : string.Empty; return File.Exists("/usr/bin/git") ? "/usr/bin/git" : string.Empty;
} }
@ -57,13 +51,9 @@ namespace SourceGit.Native
public void OpenInFileManager(string path, bool select) public void OpenInFileManager(string path, bool select)
{ {
if (Directory.Exists(path)) if (Directory.Exists(path))
{
Process.Start("open", $"\"{path}\""); Process.Start("open", $"\"{path}\"");
}
else if (File.Exists(path)) else if (File.Exists(path))
{
Process.Start("open", $"\"{path}\" -R"); Process.Start("open", $"\"{path}\" -R");
}
} }
public void OpenTerminal(string workdir) public void OpenTerminal(string workdir)
@ -71,8 +61,9 @@ namespace SourceGit.Native
var dir = string.IsNullOrEmpty(workdir) ? "~" : workdir; var dir = string.IsNullOrEmpty(workdir) ? "~" : workdir;
dir = dir.Replace(" ", "\\ "); dir = dir.Replace(" ", "\\ ");
var terminal = DetectTerminal();
var cmdBuilder = new StringBuilder(); var cmdBuilder = new StringBuilder();
switch (_terminal) switch (terminal)
{ {
case TerminalType.iTerm2: case TerminalType.iTerm2:
cmdBuilder.AppendLine("on run argv"); cmdBuilder.AppendLine("on run argv");
@ -109,6 +100,12 @@ namespace SourceGit.Native
Process.Start("open", $"\"{file}\""); Process.Start("open", $"\"{file}\"");
} }
private readonly TerminalType _terminal; private TerminalType DetectTerminal()
{
if (Directory.Exists("/Applications/iTerm.app"))
return TerminalType.iTerm2;
return TerminalType.Default;
}
} }
} }