diff --git a/Source/LibationAvalonia/Views/MainWindow.Upgrade.cs b/Source/LibationAvalonia/Views/MainWindow.Upgrade.cs index a4cb95b4..02b315ba 100644 --- a/Source/LibationAvalonia/Views/MainWindow.Upgrade.cs +++ b/Source/LibationAvalonia/Views/MainWindow.Upgrade.cs @@ -24,7 +24,7 @@ namespace LibationAvalonia.Views upgrader.DownloadBegin += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(true)); upgrader.DownloadCompleted += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(false)); - Opened += async (_, _) => await upgrader.CheForUpgradeAsync(upgradeAvailable); + Opened += async (_, _) => await upgrader.CheckForUpgradeAsync(upgradeAvailable); #endif } diff --git a/Source/LibationUiBase/Upgrader.cs b/Source/LibationUiBase/Upgrader.cs index 5bf94216..230b2410 100644 --- a/Source/LibationUiBase/Upgrader.cs +++ b/Source/LibationUiBase/Upgrader.cs @@ -40,7 +40,7 @@ namespace LibationUiBase public event EventHandler DownloadProgress; public event EventHandler DownloadCompleted; - public async Task CheForUpgradeAsync(Func upgradeAvailableHandler) + public async Task CheckForUpgradeAsync(Func upgradeAvailableHandler) { try { diff --git a/Source/LibationWinForms/Form1.Upgrade.cs b/Source/LibationWinForms/Form1.Upgrade.cs index e1b9466d..2d2ceb04 100644 --- a/Source/LibationWinForms/Form1.Upgrade.cs +++ b/Source/LibationWinForms/Form1.Upgrade.cs @@ -25,7 +25,7 @@ namespace LibationWinForms upgrader.DownloadBegin += (_, _) => Invoke(() => setProgressVisible(true)); upgrader.DownloadCompleted += (_, _) => Invoke(() => setProgressVisible(false)); - Shown += async (_, _) => await upgrader.CheForUpgradeAsync(upgradeAvailable); + Shown += async (_, _) => await upgrader.CheckForUpgradeAsync(upgradeAvailable); #endif } diff --git a/Source/LoadByOS/WindowsConfigApp/WinInterop.cs b/Source/LoadByOS/WindowsConfigApp/WinInterop.cs index ced9929f..5aef4bea 100644 --- a/Source/LoadByOS/WindowsConfigApp/WinInterop.cs +++ b/Source/LoadByOS/WindowsConfigApp/WinInterop.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using LibationFileManager; using System.IO; using System; +using Dinah.Core; namespace WindowsConfigApp { @@ -42,7 +43,10 @@ namespace WindowsConfigApp File.Copy("ZipExtractor.exe", zipExtractor, overwrite: true); - RunAsRoot(zipExtractor, $"--input \"{upgradeBundle}\" --output \"{thisDir}\" --executable \"{thisExe}\""); + RunAsRoot(zipExtractor, + $"--input {upgradeBundle.SurroundWithQuotes()} " + + $"--output {thisDir.SurroundWithQuotes()} " + + $"--executable {thisExe.SurroundWithQuotes()}"); } public Process RunAsRoot(string exe, string args)