diff --git a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs
index 5599e0f..6b69c3e 100644
--- a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs
+++ b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs
@@ -267,26 +267,38 @@ public partial class MainForm : Window
private async void MainForm_Loaded(object? sender, RoutedEventArgs e)
{
#if !DISABLE_UPDATE
- var myAppPath = EnvironmentEx.ProcessPath;
+#if !DEBUG
+ try
+ {
+#endif
+ var myAppPath = EnvironmentEx.ProcessPath!;
var updater = new UpdateClient(Program.UpdateUrl, Assembly.GetEntryAssembly()!.GetAppVersion(), AppChannel.Stable)
{
Distro = RuntimeInformationsEx.GetRuntimeIdentifier(),
};
if (await updater.CheckForUpdate() is {} packageToInstall
- && await MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.UpdateAvailable_Title, MsgBoxLangRes.UpdateAvailable, ButtonEnum.YesNo).ShowWindowDialogAsync(this) == ButtonResult.Ok)
+ && await MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.UpdateAvailable_Title, MsgBoxLangRes.UpdateAvailable, ButtonEnum.YesNo, MsBox.Avalonia.Enums.Icon.Info).ShowWindowDialogAsync(this) == ButtonResult.Yes)
{
SetStatus(GeneralLangRes.DownloadProgramUpdate, Symbols.Fluent.GetImageSource(SymbolsFluent.software_installer));
IsEnabled = false;
if (await updater.DownloadPackageAsync(packageToInstall)
&& await updater.InstallPackageAsync(packageToInstall, myAppPath))
{
- Process.Start(myAppPath);
+ IsVisible = false;
+ await Process.Start(myAppPath).WaitForExitAsync();
Environment.Exit(0);
return;
}
IsEnabled = true;
}
+#if !DEBUG
+ }
+ catch
+ {
+ IsEnabled = true;
+ }
+#endif
#endif
CheckStatusAndUpdate(true);
diff --git a/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj b/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
index eb7d9f6..022fb50 100644
--- a/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
+++ b/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
@@ -81,7 +81,7 @@
All
-
+
diff --git a/ModpackUpdater.Apps.Client.Gui/publish.sh b/ModpackUpdater.Apps.Client.Gui/publish.sh
new file mode 100755
index 0000000..070c72f
--- /dev/null
+++ b/ModpackUpdater.Apps.Client.Gui/publish.sh
@@ -0,0 +1,9 @@
+pupnet -y -v "$1[1]" -r linux-x64 -k appimage
+pupnet -y -v "$1[1]" -r linux-x64 -k flatpak -p DefineConstants=DISABLE_UPDATE
+#pupnet -y -v "$1[1]"-r linux-x64 -k deb -p DefineConstants=DISABLE_UPDATE
+#pupnet -y -v "$1[1]"-r linux-x64 -k rpm -p DefineConstants=DISABLE_UPDATE
+pupnet -y -v "$1[1]" -r linux-arm64 -k appimage
+pupnet -y -v "$1[1]" -r linux-arm64 -k flatpak -p DefineConstants=DISABLE_UPDATE
+#pupnet -y -v "$1[1]"-r linux-arm64 -k deb -p DefineConstants=DISABLE_UPDATE
+#pupnet -y -v "$1[1]"-r linux-arm64 -k rpm -p DefineConstants=DISABLE_UPDATE
+pupnet -y -v "$1[1]" -r win-x64 -k zip
\ No newline at end of file
diff --git a/Version.cs b/Version.cs
index 705d991..70d3170 100644
--- a/Version.cs
+++ b/Version.cs
@@ -1,3 +1,3 @@
using Pilz;
-[assembly: AssemblyAppVersion("1.10.0")]
\ No newline at end of file
+[assembly: AssemblyAppVersion(AssemblyAppVersionAttribute.EntryAssemblyVersionKey)]
\ No newline at end of file
diff --git a/publish.sh b/publish.sh
deleted file mode 100755
index 0ee086e..0000000
--- a/publish.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-pupnet -y -r linux-x64 -k appimage
-pupnet -y -r linux-x64 -k flatpak -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -r linux-x64 -k deb -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -r linux-x64 -k rpm -p DefineConstants=DISABLE_UPDATE
-pupnet -y -r linux-arm64 -k appimage
-pupnet -y -r linux-arm64 -k flatpak -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -r linux-arm64 -k deb -p DefineConstants=DISABLE_UPDATE
-#pupnet -y -r linux-arm64 -k rpm -p DefineConstants=DISABLE_UPDATE
-pupnet -y -r win-x64 -k zip
\ No newline at end of file