diff --git a/DistroInstaller/Program.cs b/DistroInstaller/Program.cs index 06e4cc9..062cb29 100644 --- a/DistroInstaller/Program.cs +++ b/DistroInstaller/Program.cs @@ -42,7 +42,7 @@ namespace LANraragi.DistroInstaller // Otherwise, just refer to the CLI argument bool needsUpgrade = new DesktopBridge.Helpers().IsRunningAsUwp() ? NeedsUpgradeMSIX() : NeedsUpgradeCLI(args); - // TODO no uninstall mechanism on MSIX? + // Unused by the actual MSI setup, but might as well leave the functionality in bool needsUninstall = args.Length > 0 && args[0] == "-remove"; if (!WslApi.WslIsDistributionRegistered(distro) || needsUpgrade) diff --git a/Karen/MainWindow.xaml b/Karen/MainWindow.xaml index 0b4ccc7..adde195 100644 --- a/Karen/MainWindow.xaml +++ b/Karen/MainWindow.xaml @@ -63,7 +63,7 @@ You're using the Karen Bootstrapper for LANraragi, - Version 2.2 + Version 2.3 Consider installing LRReader from the Microsoft Store! diff --git a/Setup/Program.cs b/Setup/Program.cs index e0cf9c2..3f7155e 100644 --- a/Setup/Program.cs +++ b/Setup/Program.cs @@ -128,11 +128,11 @@ namespace Setup [CustomAction] public static ActionResult UnRegisterWslDistro(Session session) { - var distroInstaller = session.Property("INSTALLDIR") + @"DistroInstaller.exe"; + // We don't use distroInstaller here since INSTALLDIR isn't set when uninstalling. return session.HandleErrors(() => { session.Log("Removing previous WSL Distro"); - var wslProc = Process.Start("distroInstaller", "-remove"); + var wslProc = Process.Start("wslconfig.exe", "/unregister lanraragi"); wslProc.WaitForExit(); }); } diff --git a/Setup/Setup.csproj b/Setup/Setup.csproj index 8f6b1df..1a2f252 100644 --- a/Setup/Setup.csproj +++ b/Setup/Setup.csproj @@ -67,7 +67,9 @@ - + + Form + WslCheckDialog.cs