Improved: Show help menu for CLI installer, and set more sensible ove…

…rride for DOTNET_ROOT and DOTNET_BUNDLE_EXTRACT_BASE_DIR
Reloaded-Project · Sep 20, 2024 · 29e0ddd · 29e0ddd
1 parent 886b7eb
commit 29e0ddd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/source/Reloaded.Mod.Installer.Cli/Program.cs b/source/Reloaded.Mod.Installer.Cli/Program.cs
@@ -12,6 +12,10 @@ public class Program
 
     public static void Main(string[] args)
     {
+        Console.WriteLine("Reloaded-II CLI Installer\n" +
+                          "Mode flags:\n" +
+                          "--dependenciesOnly: Don't install Reloaded, just install runtimes.");
+
         if (!TryRunCli(args))
             InstallInCli();
     }

diff --git a/source/Reloaded.Mod.Installer.Lib/MainWindowViewModel.cs b/source/Reloaded.Mod.Installer.Lib/MainWindowViewModel.cs
@@ -92,11 +92,12 @@ await CheckAndInstallMissingRuntimesAsync(settings.InstallLocation, tempDownload
 
             CurrentStepDescription = "All Set";
 
-            // On WINE, overwrite 
+            // On WINE, overwrite environment variables that may be inherited
+            // from host permanently.
             if (WineDetector.IsWine())
             {
-                SetEnvironmentVariable("DOTNET_ROOT", "");
-                SetEnvironmentVariable("DOTNET_BUNDLE_EXTRACT_BASE_DIR", "");
+                SetEnvironmentVariable("DOTNET_ROOT", "%ProgramFiles%\\dotnet");
+                SetEnvironmentVariable("DOTNET_BUNDLE_EXTRACT_BASE_DIR", "%TEMP%\\.net");
             }
 
             if (settings.StartReloaded)