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

enhance: allow terminal without full path and adjust error message

Browse source
This commit is contained in:
Aikawa Yataro 2024-09-16 11:55:50 +00:00
parent 4deac98c4e
commit 53c915578e
No known key found for this signature in database
GPG key ID: 1C5D95FB10179404
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Native/Linux.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq.Expressions;
using System.Runtime.Versioning; using System.Runtime.Versioning;
using Avalonia; using Avalonia;
@ -71,9 +72,9 @@ namespace SourceGit.Native
public void OpenTerminal(string workdir) public void OpenTerminal(string workdir)
{ {
if (string.IsNullOrEmpty(OS.ShellOrTerminal) || !File.Exists(OS.ShellOrTerminal)) if (string.IsNullOrEmpty(OS.ShellOrTerminal))
{ {
App.RaiseException(workdir, $"Can not found terminal! Please confirm that the correct shell/terminal has been configured."); App.RaiseException(workdir, $"Terminal is not specified! Please confirm that the correct shell/terminal has been configured.");
return; return;
} }
@ -81,8 +82,15 @@ namespace SourceGit.Native
var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
startInfo.WorkingDirectory = string.IsNullOrEmpty(workdir) ? home : workdir; startInfo.WorkingDirectory = string.IsNullOrEmpty(workdir) ? home : workdir;
startInfo.FileName = OS.ShellOrTerminal; startInfo.FileName = OS.ShellOrTerminal;
try
{
Process.Start(startInfo); Process.Start(startInfo);
} }
catch (Exception e)
{
App.RaiseException(workdir, e.Message);
}
}
public void OpenWithDefaultEditor(string file) public void OpenWithDefaultEditor(string file)
{ {

2
src/Native/OS.cs
View file

@ -95,7 +95,7 @@ namespace SourceGit.Native
public static void OpenTerminal(string workdir) public static void OpenTerminal(string workdir)
{ {
if (string.IsNullOrEmpty(ShellOrTerminal)) if (string.IsNullOrEmpty(ShellOrTerminal))
App.RaiseException(workdir, $"Can not found terminal! Please confirm that the correct shell/terminal has been configured."); App.RaiseException(workdir, $"Terminal is not specified! Please confirm that the correct shell/terminal has been configured.");
else else
_backend.OpenTerminal(workdir); _backend.OpenTerminal(workdir);
} }

2
src/Native/Windows.cs
View file

@ -160,7 +160,7 @@ namespace SourceGit.Native
{ {
if (string.IsNullOrEmpty(OS.ShellOrTerminal) || !File.Exists(OS.ShellOrTerminal)) if (string.IsNullOrEmpty(OS.ShellOrTerminal) || !File.Exists(OS.ShellOrTerminal))
{ {
App.RaiseException(workdir, $"Can not found terminal! Please confirm that the correct shell/terminal has been configured."); App.RaiseException(workdir, $"Terminal is not specified! Please confirm that the correct shell/terminal has been configured.");
return; return;
} }