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 1

refactor: terminal launch on macOS without temporary AppleScript

Browse source
This commit is contained in:
Chiahong Hong 2024-09-10 00:49:31 +08:00
parent b1ce8c5451
commit 6d18839237
No known key found for this signature in database
GPG key ID: 77021906D88E7150
1 changed files with 6 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/Native/MacOS.cs
View file

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Runtime.Versioning; using System.Runtime.Versioning;
using System.Text;
using Avalonia; using Avalonia;
@ -12,12 +11,6 @@ namespace SourceGit.Native
[SupportedOSPlatform("macOS")] [SupportedOSPlatform("macOS")]
internal class MacOS : OS.IBackend internal class MacOS : OS.IBackend
{ {
enum TerminalType
{
Default,
iTerm2,
}
public void SetupApp(AppBuilder builder) public void SetupApp(AppBuilder builder)
{ {
builder.With(new MacOSPlatformOptions() builder.With(new MacOSPlatformOptions()
@ -58,41 +51,10 @@ namespace SourceGit.Native
public void OpenTerminal(string workdir) public void OpenTerminal(string workdir)
{ {
var dir = string.IsNullOrEmpty(workdir) ? "~" : workdir; var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
dir = dir.Replace(" ", "\\ "); var dir = string.IsNullOrEmpty(workdir) ? home : workdir;
var terminal = DetectTerminal(); var terminal = DetectTerminal();
var cmdBuilder = new StringBuilder(); Process.Start("open", $"-a {terminal} \"{dir}\"");
switch (terminal)
{
case TerminalType.iTerm2:
cmdBuilder.AppendLine("on run argv");
cmdBuilder.AppendLine(" tell application \"iTerm2\"");
cmdBuilder.AppendLine(" create window with default profile");
cmdBuilder.AppendLine(" tell the current session of the current window");
cmdBuilder.AppendLine($" write text \"cd {dir}\"");
cmdBuilder.AppendLine(" end tell");
cmdBuilder.AppendLine(" end tell");
cmdBuilder.AppendLine("end run");
break;
default:
cmdBuilder.AppendLine("on run argv");
cmdBuilder.AppendLine(" tell application \"Terminal\"");
cmdBuilder.AppendLine($" do script \"cd {dir}\"");
cmdBuilder.AppendLine(" activate");
cmdBuilder.AppendLine(" end tell");
cmdBuilder.AppendLine("end run");
break;
}
var tmp = Path.GetTempFileName();
File.WriteAllText(tmp, cmdBuilder.ToString());
var proc = Process.Start("osascript", $"\"{tmp}\"");
if (proc != null)
proc.Exited += (_, _) => File.Delete(tmp);
else
File.Delete(tmp);
} }
public void OpenWithDefaultEditor(string file) public void OpenWithDefaultEditor(string file)
@ -100,12 +62,12 @@ namespace SourceGit.Native
Process.Start("open", $"\"{file}\""); Process.Start("open", $"\"{file}\"");
} }
private TerminalType DetectTerminal() private static string DetectTerminal()
{ {
if (Directory.Exists("/Applications/iTerm.app")) if (Directory.Exists("/Applications/iTerm.app"))
return TerminalType.iTerm2; return "iTerm";
return TerminalType.Default; return "Terminal";
} }
} }
} }