fix of PSScriptRoot

steve02081504 · Aug 10, 2024 · 2d1b01a · 2d1b01a
1 parent 86f1ccf
commit 2d1b01a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/programFrames/default.cs b/src/programFrames/default.cs
@@ -1943,18 +1943,20 @@ public PSRunner() {
 					this.PSRunSpace.SessionStateProxy.SetVariable("PSEXEscript", script);
 				}
 			}
-			/*
-			#if !Pwsh20
+			script = "function PSEXEMainFunction{"+script+"}";
+			#if Pwsh20
+				this.pwsh.AddScript(script);
+			#else
 			{
 				Token[] tokens;
 				ParseError[] errors;
 				ScriptBlockAst AST = Parser.ParseInput(script, exepath, out tokens, out errors);
+				this.PSRunSpace.SessionStateProxy.SetVariable("PSEXEIniter", AST.GetScriptBlock());
 				if(errors.Length > 0)
 					throw new System.InvalidProgramException(errors[0].Message);
+				this.pwsh.AddScript(".$PSEXEIniter");
 			}
 			#endif
-			*/
-			this.pwsh.AddScript("function PSEXEMainFunction{"+script+"}");
 		}
 		~PSRunner() {
 			this.pwsh.Dispose();