diff options
| author | Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com> | 2024-02-15 09:41:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-15 10:41:43 +0100 |
| commit | dfb14a56077707a22379592f812a3e26a24a4367 (patch) | |
| tree | 150e4fec365247031ff0348e0f98e9468ce8fc23 | |
| parent | 904a5ffcb4d7339efed24156409e67b58c0e77bc (diff) | |
Updaters: Fix ARM Linux Updater (#6316)1.1.1193
* Remove Arch Checks
* Fix ARM Linux updater
| -rw-r--r-- | src/Ryujinx.Ava/Assets/Locales/en_US.json | 2 | ||||
| -rw-r--r-- | src/Ryujinx.Ava/Modules/Updater/Updater.cs | 17 | ||||
| -rw-r--r-- | src/Ryujinx/Modules/Updater/Updater.cs | 13 |
3 files changed, 4 insertions, 28 deletions
diff --git a/src/Ryujinx.Ava/Assets/Locales/en_US.json b/src/Ryujinx.Ava/Assets/Locales/en_US.json index b02613a7..1ecc5da4 100644 --- a/src/Ryujinx.Ava/Assets/Locales/en_US.json +++ b/src/Ryujinx.Ava/Assets/Locales/en_US.json @@ -333,8 +333,6 @@ "DialogUpdaterAddingFilesMessage": "Adding New Update...", "DialogUpdaterCompleteMessage": "Update Complete!", "DialogUpdaterRestartMessage": "Do you want to restart Ryujinx now?", - "DialogUpdaterArchNotSupportedMessage": "You are not running a supported system architecture!", - "DialogUpdaterArchNotSupportedSubMessage": "(Only x64 systems are supported!)", "DialogUpdaterNoInternetMessage": "You are not connected to the Internet!", "DialogUpdaterNoInternetSubMessage": "Please verify that you have a working Internet connection!", "DialogUpdaterDirtyBuildMessage": "You Cannot update a Dirty build of Ryujinx!", diff --git a/src/Ryujinx.Ava/Modules/Updater/Updater.cs b/src/Ryujinx.Ava/Modules/Updater/Updater.cs index bd211fa5..5795f34f 100644 --- a/src/Ryujinx.Ava/Modules/Updater/Updater.cs +++ b/src/Ryujinx.Ava/Modules/Updater/Updater.cs @@ -68,7 +68,8 @@ namespace Ryujinx.Modules } else if (OperatingSystem.IsLinux()) { - _platformExt = "linux_x64.tar.gz"; + var arch = RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "arm64" : "x64"; + _platformExt = $"linux_{arch}.tar.gz"; } Version newVersion; @@ -637,20 +638,6 @@ namespace Ryujinx.Modules public static bool CanUpdate(bool showWarnings) { #if !DISABLE_UPDATER - if (RuntimeInformation.OSArchitecture != Architecture.X64 && !OperatingSystem.IsMacOS()) - { - if (showWarnings) - { - Dispatcher.UIThread.InvokeAsync(() => - ContentDialogHelper.CreateWarningDialog( - LocaleManager.Instance[LocaleKeys.DialogUpdaterArchNotSupportedMessage], - LocaleManager.Instance[LocaleKeys.DialogUpdaterArchNotSupportedSubMessage]) - ); - } - - return false; - } - if (!NetworkInterface.GetIsNetworkAvailable()) { if (showWarnings) diff --git a/src/Ryujinx/Modules/Updater/Updater.cs b/src/Ryujinx/Modules/Updater/Updater.cs index 16fbc36a..6c0f9cce 100644 --- a/src/Ryujinx/Modules/Updater/Updater.cs +++ b/src/Ryujinx/Modules/Updater/Updater.cs @@ -78,7 +78,8 @@ namespace Ryujinx.Modules } else if (OperatingSystem.IsLinux()) { - _platformExt = "linux_x64.tar.gz"; + var arch = RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "arm64" : "x64"; + _platformExt = $"linux_{arch}.tar.gz"; artifactIndex = 0; } @@ -512,16 +513,6 @@ namespace Ryujinx.Modules public static bool CanUpdate(bool showWarnings) { #if !DISABLE_UPDATER - if (RuntimeInformation.OSArchitecture != Architecture.X64) - { - if (showWarnings) - { - GtkDialog.CreateWarningDialog("You are not running a supported system architecture!", "(Only x64 systems are supported!)"); - } - - return false; - } - if (!NetworkInterface.GetIsNetworkAvailable()) { if (showWarnings) |