feat: new option IsEnvironmentVariable

lemutec · Nov 30, 2024 · 75d5680 · 75d5680
1 parent 00b91cc
commit 75d5680
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 4 deletions.
diff --git a/build/MicaSetup.Tools/MakeMica.Cli/Core/CSharpProgram.cs b/build/MicaSetup.Tools/MakeMica.Cli/Core/CSharpProgram.cs
@@ -45,6 +45,11 @@ public static void SetupConfig(string csPath, MicaConfig config, bool isUninst =
             }
         }
 
+        if (config.IsEnvironmentVariable)
+        {
+            root = root.ReplaceOptionWithBoolean("IsEnvironmentVariable", config.IsEnvironmentVariable);
+        }
+
         if (!string.IsNullOrWhiteSpace(config.Version))
         {
             if (Version.TryParse(config.Version, out _))

diff --git a/build/MicaSetup.Tools/MakeMica.Shared/MicaConfig.cs b/build/MicaSetup.Tools/MakeMica.Shared/MicaConfig.cs
@@ -206,6 +206,11 @@ public class MicaConfig
     /// </summary>
     public string? UnpackingPassword { get; set; } = null;
 
+    /// <summary>
+    /// Indicates whether to add environment variable
+    /// </summary>
+    public bool IsEnvironmentVariable { get; set; } = false;
+
     /// <summary>
     /// <see cref="MicaSetup.Option.MessageOfPage1"/>
     /// </summary>

diff --git a/build/MicaSetup.Tools/MakeMica/Resources/Templates/Sample.json b/build/MicaSetup.Tools/MakeMica/Resources/Templates/Sample.json
@@ -6,7 +6,7 @@
   "KeyName": "MicaApp",
   "ExeName": "MicaApp.exe",
   "Publisher": "Lemutec",
-  "Version": "1.0.0",
+  "Version": "${Package}${ExeName}|3",
   "TargetFramework": "net472",
   "Guid": "00000000-0000-0000-0000-000000000000",
   "Favicon": null,
@@ -34,6 +34,7 @@
   "IsRefreshExplorer": true,
   "IsInstallCertificate": false,
   "IsEnableUninstallDelayUntilReboot": true,
+  "IsEnvironmentVariable": false,
   "OverlayInstallRemoveExt": "exe,dll,pdb",
   "UnpackingPassword": null,
   "MessageOfPage1": null,

diff --git a/build/MicaSetup/Helper/Setup/InstallHelper.cs b/build/MicaSetup/Helper/Setup/InstallHelper.cs
@@ -236,6 +236,25 @@ public static void Install(Stream archiveStream, Action<double, string> progress
             }
         }
 
+        if (Option.Current.IsEnvironmentVariable)
+        {
+            try
+            {
+                if (RuntimeHelper.IsElevated)
+                {
+                    EnvironmentVariableHelper.AddDirectoryToSystemPath(Option.Current.InstallLocation);
+                }
+                else
+                {
+                    EnvironmentVariableHelper.AddDirectoryToUserPath(Option.Current.InstallLocation);
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.Error(e);
+            }
+        }
+
         try
         {
             StartMenuHelper.AddToRecent(Path.Combine(Option.Current.InstallLocation, Option.Current.ExeName));

diff --git a/build/MicaSetup/Helper/Setup/UninstallHelper.cs b/build/MicaSetup/Helper/Setup/UninstallHelper.cs
@@ -1,5 +1,4 @@
-using MicaSetup.Design.Controls;
-using MicaSetup.Natives;
+using MicaSetup.Natives;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -244,6 +243,25 @@ static int GetFileCount(string path)
             }
         }
 
+        if (Option.Current.IsEnvironmentVariable)
+        {
+            try
+            {
+                if (RuntimeHelper.IsElevated)
+                {
+                    EnvironmentVariableHelper.RemoveDirectoryFromSystemPath(Option.Current.InstallLocation);
+                }
+                else
+                {
+                    EnvironmentVariableHelper.RemoveDirectoryFromUserPath(Option.Current.InstallLocation);
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.Error(e);
+            }
+        }
+
         try
         {
             RegistyUninstallHelper.Delete(Option.Current.KeyName);

diff --git a/build/MicaSetup/MicaInfo.cs b/build/MicaSetup/MicaInfo.cs
@@ -2,7 +2,9 @@
 
 namespace MicaSetup;
 
-[Description("Internal mark for setup and uninst")]
+/// <summary>
+/// Internal mark for setup and uninst
+/// </summary>
 internal static class MicaInfo
 {
     public const string Version = "2.3.0.0";

diff --git a/build/MicaSetup/Option.cs b/build/MicaSetup/Option.cs
@@ -161,6 +161,12 @@ public partial class Option
     [Category("GlobalSetting")]
     public string UnpackingPassword { get; set; } = null!;
 
+    /// <summary>
+    /// Indicates whether to add environment variable
+    /// </summary>
+    [Category("GlobalSetting")]
+    public bool IsEnvironmentVariable { get; set; } = false;
+
     /// <summary>
     /// Your Product Exe file name
     /// </summary>

diff --git a/build/MicaSetup/Program.cs b/build/MicaSetup/Program.cs
@@ -53,6 +53,7 @@ internal static void Main()
                 option.OverlayInstallRemoveExt = "exe,dll,pdb";
                 option.OverlayInstallRemoveHandler = null!;
                 option.UnpackingPassword = null!;
+                option.EnvironmentVariable = null!;
                 option.AppName = "MicaApp";
                 option.KeyName = "MicaApp";
                 option.ExeName = "MicaApp.exe";

diff --git a/build/MicaSetup/Program.un.cs b/build/MicaSetup/Program.un.cs
@@ -45,6 +45,7 @@ internal static void Main()
                 option.IsRefreshExplorer = true;
                 option.IsInstallCertificate = false;
                 option.IsEnableUninstallDelayUntilReboot = true;
+                option.IsEnvironmentVariable = false;
                 option.AppName = "MicaApp";
                 option.KeyName = "MicaApp";
                 option.ExeName = "MicaApp.exe";