feat: bin in environment variable

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

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/build/MicaSetup/Helper/Setup/InstallHelper.cs b/build/MicaSetup/Helper/Setup/InstallHelper.cs
@@ -240,13 +240,26 @@ public static void Install(Stream archiveStream, Action<double, string> progress
         {
             try
             {
-                if (RuntimeHelper.IsElevated)
+                AddEnvironmentVariable(Option.Current.InstallLocation);
+
+                foreach (string directory in Directory.EnumerateDirectories(Option.Current.InstallLocation, "*", SearchOption.AllDirectories))
                 {
-                    EnvironmentVariableHelper.AddDirectoryToSystemPath(Option.Current.InstallLocation);
+                    if (new DirectoryInfo(directory).Name == "bin")
+                    {
+                        AddEnvironmentVariable(directory);
+                    }
                 }
-                else
+
+                static void AddEnvironmentVariable(string directoryPath)
                 {
-                    EnvironmentVariableHelper.AddDirectoryToUserPath(Option.Current.InstallLocation);
+                    if (RuntimeHelper.IsElevated)
+                    {
+                        EnvironmentVariableHelper.AddDirectoryToSystemPath(directoryPath);
+                    }
+                    else
+                    {
+                        EnvironmentVariableHelper.AddDirectoryToUserPath(directoryPath);
+                    }
                 }
             }
             catch (Exception e)

diff --git a/build/MicaSetup/Helper/Setup/UninstallHelper.cs b/build/MicaSetup/Helper/Setup/UninstallHelper.cs
@@ -247,13 +247,26 @@ static int GetFileCount(string path)
         {
             try
             {
-                if (RuntimeHelper.IsElevated)
+                RemoveEnvironmentVariable(Option.Current.InstallLocation);
+
+                foreach (string directory in Directory.EnumerateDirectories(Option.Current.InstallLocation, "*", SearchOption.AllDirectories))
                 {
-                    EnvironmentVariableHelper.RemoveDirectoryFromSystemPath(Option.Current.InstallLocation);
+                    if (new DirectoryInfo(directory).Name == "bin")
+                    {
+                        RemoveEnvironmentVariable(directory);
+                    }
                 }
-                else
+
+                static void RemoveEnvironmentVariable(string directoryPath)
                 {
-                    EnvironmentVariableHelper.RemoveDirectoryFromUserPath(Option.Current.InstallLocation);
+                    if (RuntimeHelper.IsElevated)
+                    {
+                        EnvironmentVariableHelper.RemoveDirectoryFromSystemPath(directoryPath);
+                    }
+                    else
+                    {
+                        EnvironmentVariableHelper.RemoveDirectoryFromUserPath(directoryPath);
+                    }
                 }
             }
             catch (Exception e)

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