mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add migration code for the new filename

Browse source
This commit is contained in:
TSR Berry 2024-03-08 02:27:09 +01:00
commit d7c12e89d4
No known key found for this signature in database
GPG key ID: 52353C0A4CCA15E2
1 changed files with 46 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/Ryujinx/Modules/Updater/Updater.cs
View file

@ -298,7 +298,14 @@ namespace Ryujinx.Modules
else else
{ {
// Find the process name. // Find the process name.
string ryuName = Path.GetFileName(Environment.ProcessPath); string ryuName = Path.GetFileName(Environment.ProcessPath) ?? string.Empty;
// Migration: Start the updated binary.
// TODO: Remove this in a future update.
if (ryuName.StartsWith("Ryujinx.Ava"))
{
ryuName = ryuName.Replace(".Ava", "");
}
// Some operating systems can see the renamed executable, so strip off the .ryuold if found. // Some operating systems can see the renamed executable, so strip off the .ryuold if found.
if (ryuName.EndsWith(".ryuold")) if (ryuName.EndsWith(".ryuold"))
@ -307,7 +314,7 @@ namespace Ryujinx.Modules
} }
// Fallback if the executable could not be found. // Fallback if the executable could not be found.
if (!Path.Exists(Path.Combine(executableDirectory, ryuName))) if (ryuName.Length == 0 || !Path.Exists(Path.Combine(executableDirectory, ryuName)))
{ {
ryuName = OperatingSystem.IsWindows() ? "Ryujinx.exe" : "Ryujinx"; ryuName = OperatingSystem.IsWindows() ? "Ryujinx.exe" : "Ryujinx";
} }
@ -759,6 +766,43 @@ namespace Ryujinx.Modules
{ {
File.Delete(file); File.Delete(file);
} }
// Migration: Delete old Ryujinx binary.
// TODO: Remove this in a future update.
if (!OperatingSystem.IsMacOS())
{
string[] oldRyuFiles = Directory.GetFiles(_homeDir, "Ryujinx.Ava*", SearchOption.TopDirectoryOnly);
// Assume we are running the new one if the process path is not available.
// This helps to prevent an infinite loop of restarts.
string currentRyuName = Path.GetFileName(Environment.ProcessPath) ?? (OperatingSystem.IsWindows() ? "Ryujinx.exe" : "Ryujinx");
string newRyuName = Path.Combine(_homeDir, currentRyuName.Replace(".Ava", ""));
if (!currentRyuName.Contains("Ryujinx.Ava"))
{
foreach (string oldRyuFile in oldRyuFiles)
{
File.Delete(oldRyuFile);
}
}
// Should we be running the old binary, start the new one if possible.
else if (File.Exists(newRyuName))
{
ProcessStartInfo processStart = new(newRyuName)
{
UseShellExecute = true,
WorkingDirectory = _homeDir,
};
foreach (string argument in CommandLineState.Arguments)
{
processStart.ArgumentList.Add(argument);
}
Process.Start(processStart);
Environment.Exit(0);
}
}
} }
} }
} }