Bugfix - Hyper should run multiple distro side-by-side

wslhub · May 1, 2019 · fd01c6d · fd01c6d
1 parent f84f105
commit fd01c6d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/WslManager/MainForm.cs b/WslManager/MainForm.cs
@@ -818,19 +818,19 @@ private void ShimGenerator_DoWork(object sender, DoWorkEventArgs e)
 
             foreach (var eachItem in items)
             {
-                var key = eachItem.DistroName;
+                var fileName = eachItem.DistroName;
                 var eachResult = WslShimGenerator.CreateWslShim(
-                    key, false, targetDir);
+                    eachItem.DistroName, false, targetDir, fileName);
 
                 if (eachResult.Errors.HasErrors)
-                    result.Add(key, eachResult);
+                    result.Add(fileName, eachResult);
 
-                key = eachItem.DistroName + "_simple";
+                fileName = eachItem.DistroName + "_simple";
                 eachResult = WslShimGenerator.CreateWslShim(
-                    key, true, targetDir);
+                    eachItem.DistroName, true, targetDir, fileName);
 
                 if (eachResult.Errors.HasErrors)
-                    result.Add(key, eachResult);
+                    result.Add(fileName, eachResult);
             }
         }
 

diff --git a/WslManager/WslShimGenerator.cs b/WslManager/WslShimGenerator.cs
@@ -10,7 +10,7 @@ namespace WslManager
 {
     internal static class WslShimGenerator
     {
-        public static CompilerResults CreateWslShim(string distroName, bool ignoreSwitches, string outputPath)
+        public static CompilerResults CreateWslShim(string distroName, bool ignoreSwitches, string outputPath, string outputFileName)
         {
             var codeCompileUnit = new CodeCompileUnit();
 
@@ -38,7 +38,7 @@ public static CompilerResults CreateWslShim(string distroName, bool ignoreSwitch
 
             var declareDistroNameVariable = new CodeVariableDeclarationStatement(typeof(string), "distroName")
             {
-                InitExpression = new CodePrimitiveExpression("Ubuntu1604"),
+                InitExpression = new CodePrimitiveExpression(distroName),
             };
 
             var declareWslPathVariable = new CodeVariableDeclarationStatement(typeof(string), "wslPath")
@@ -214,7 +214,7 @@ public static CompilerResults CreateWslShim(string distroName, bool ignoreSwitch
             {
                 GenerateExecutable = true,
                 GenerateInMemory = false,
-                OutputAssembly = Path.Combine(outputPath, $"{distroName}.exe"),
+                OutputAssembly = Path.Combine(outputPath, $"{outputFileName}.exe"),
                 CompilerOptions = string.Join(" ", "/optimize+", iconCompilerOption),
             };