github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved upgrade 

https://github.com/2dust/v2rayN/issues/6102
pull/6126/head
2dust 2024-11-20 10:29:04 +08:00
parent b11e68cfd8
commit e915726c52
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
v2rayN/AmazTool/UpgradeApp.cs
View File

@ -10,7 +10,7 @@ namespace AmazTool
{ {
Console.WriteLine($"{LocalizationHelper.GetLocalizedValue("Start_Unzipping")}\n{fileName}"); Console.WriteLine($"{LocalizationHelper.GetLocalizedValue("Start_Unzipping")}\n{fileName}");
Thread.Sleep(9000); Waiting(9);
if (!File.Exists(fileName)) if (!File.Exists(fileName))
{ {
@ -24,8 +24,12 @@ namespace AmazTool
var existing = Process.GetProcessesByName(V2rayN); var existing = Process.GetProcessesByName(V2rayN);
foreach (var pp in existing) foreach (var pp in existing)
{ {
pp?.Kill(); var path = pp.MainModule?.FileName ?? "";
pp?.WaitForExit(1000); if (path.StartsWith(GetPath(V2rayN)))
{
pp?.Kill();
pp?.WaitForExit(1000);
}
} }
} }
catch (Exception ex) catch (Exception ex)
@ -87,7 +91,7 @@ namespace AmazTool
} }
Console.WriteLine(LocalizationHelper.GetLocalizedValue("Restart_v2rayN")); Console.WriteLine(LocalizationHelper.GetLocalizedValue("Restart_v2rayN"));
Thread.Sleep(9000); Waiting(9);
Process process = new() Process process = new()
{ {
StartInfo = new() StartInfo = new()
@ -120,6 +124,15 @@ namespace AmazTool
return Path.Combine(startupPath, fileName); return Path.Combine(startupPath, fileName);
} }
private static void Waiting(int second)
{
for (var i = second; i > 0; i--)
{
Console.WriteLine(i);
Thread.Sleep(1000);
}
}
private static string V2rayN => "v2rayN"; private static string V2rayN => "v2rayN";
} }
} }

1
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
View File

@ -324,6 +324,7 @@ namespace ServiceLib.ViewModels
if (process.Id > 0) if (process.Id > 0)
{ {
await MyAppExitAsync(false); await MyAppExitAsync(false);
await MyAppExitAsync(false);
} }
} }