This commit is contained in:
bao-qian
2016-05-19 23:28:13 +01:00
parent c896b445bd
commit 97f0516630

View File

@@ -174,20 +174,26 @@ namespace Wox.Plugin.CMD
else if (_settings.Shell == Shell.RunCommand) else if (_settings.Shell == Shell.RunCommand)
{ {
var parts = command.Split(new[] { ' ' }, 2); var parts = command.Split(new[] { ' ' }, 2);
var filename = parts[0]; if (parts.Length == 1)
var path = FullPath(filename);
if (string.IsNullOrEmpty(path) || parts.Length == 1)
{ {
info = new ProcessStartInfo(command); info = new ProcessStartInfo(command);
} }
else else
{ {
var arguemtns = parts[1]; var filename = parts[0];
info = new ProcessStartInfo if (ExistInPath(filename))
{ {
FileName = filename, info = new ProcessStartInfo(command);
Arguments = arguemtns }
}; else
{
var arguemtns = parts[1];
info = new ProcessStartInfo
{
FileName = filename,
Arguments = arguemtns
};
}
} }
} }
else else
@@ -223,11 +229,11 @@ namespace Wox.Plugin.CMD
} }
} }
private string FullPath(string filename) private bool ExistInPath(string filename)
{ {
if (File.Exists(filename)) if (File.Exists(filename))
{ {
return filename; return true;
} }
else else
{ {
@@ -236,22 +242,18 @@ namespace Wox.Plugin.CMD
{ {
foreach (var path in values.Split(';')) foreach (var path in values.Split(';'))
{ {
var fullPath1 = Path.Combine(path, filename); var path1 = Path.Combine(path, filename);
var fullPath2 = Path.Combine(path, filename + ".exe"); var path2 = Path.Combine(path, filename + ".exe");
if (File.Exists(fullPath1)) if (File.Exists(path1) || File.Exists(path2))
{ {
return fullPath1; return true;
}
else if (File.Exists(fullPath2))
{
return fullPath2;
} }
} }
return string.Empty; return false;
} }
else else
{ {
return string.Empty; return false;
} }
} }
} }