diff --git a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs index a39bf50..a2bb484 100644 --- a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs +++ b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs @@ -306,7 +306,7 @@ public partial class MainForm : Window private async void MainForm_Loaded(object? sender, RoutedEventArgs e) { - var updates = new AppUpdates(Program.UpdateUrl, this); + var updates = new AppUpdates("manager", this); updates.OnDownloadProgramUpdate += (_, _) => SetStatus(GeneralLangRes.DownloadProgramUpdate, AppGlobals.Symbols.GetImageSource(AppSymbols.software_installer)); await updates.UpdateApp(); ClearStatus(); diff --git a/ModpackUpdater.Apps.Client.Gui/Program.cs b/ModpackUpdater.Apps.Client.Gui/Program.cs index aeb49ca..4a651d6 100644 --- a/ModpackUpdater.Apps.Client.Gui/Program.cs +++ b/ModpackUpdater.Apps.Client.Gui/Program.cs @@ -8,8 +8,6 @@ namespace ModpackUpdater.Apps.Client.Gui; public static class Program { - public const string UpdateUrl = "https://git.pilzinsel64.de/litw-refined/minecraft-modpack-updater/-/snippets/3/raw/main/updates-new.json"; - private static readonly SettingsManager settingsManager; public static ISettings Settings => settingsManager.Instance; diff --git a/ModpackUpdater.Apps.Manager/Program.cs b/ModpackUpdater.Apps.Manager/Program.cs index 09be226..6046a8a 100644 --- a/ModpackUpdater.Apps.Manager/Program.cs +++ b/ModpackUpdater.Apps.Manager/Program.cs @@ -7,8 +7,6 @@ namespace ModpackUpdater.Apps.Manager; public static class Program { - public const string UpdateUrl = "https://git.pilzinsel64.de/litw-refined/minecraft-modpack-updater/-/snippets/3/raw/main/updates-manager.json"; - internal static readonly SettingsManager settingsManager; public static ISettings Settings => settingsManager.Instance; diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs index 2733108..1204575 100644 --- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs +++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs @@ -127,7 +127,7 @@ public partial class MainWindow : Window, IMainApi private async void Window_OnLoaded(object? sender, RoutedEventArgs e) { - var updater = new AppUpdates(Program.UpdateUrl, this) + var updater = new AppUpdates("client", this) { UsePopups = true, }; diff --git a/ModpackUpdater.Apps/AppUpdates.cs b/ModpackUpdater.Apps/AppUpdates.cs index 44720fd..80116f2 100644 --- a/ModpackUpdater.Apps/AppUpdates.cs +++ b/ModpackUpdater.Apps/AppUpdates.cs @@ -10,8 +10,10 @@ using Pilz.Updating.Client; namespace ModpackUpdater.Apps; -public class AppUpdates(string updateUrl, Window mainWindow) +public class AppUpdates(string appShortName, Window mainWindow) { + public const string UpdateUrl = "https://git.pilzinsel64.de/litw-refined/minecraft-modpack-updater/-/snippets/3/raw/main/updates-new.json"; + public event EventHandler? OnDownloadProgramUpdate; public bool UsePopups { get; set; } @@ -39,9 +41,9 @@ public class AppUpdates(string updateUrl, Window mainWindow) return; var myAppPath = EnvironmentEx.ProcessPath!; - var updater = new UpdateClient(updateUrl, Assembly.GetEntryAssembly()!.GetAppVersion(), AppChannel.Stable) + var updater = new UpdateClient(UpdateUrl, Assembly.GetEntryAssembly()!.GetAppVersion(), AppChannel.Stable) { - Distro = RuntimeInformationsEx.GetRuntimeIdentifier(), + Distro = $"{appShortName}-{RuntimeInformationsEx.GetRuntimeIdentifier()}", }; if (await updater.CheckForUpdate() is not { } packageToInstall || await AskForUpdate() != ButtonResult.Yes)