Исправлена ошибка поиска библиотек

EvilBeaver · Jan 30, 2021 · 3395f4b · 3395f4b
1 parent bd9046d
commit 3395f4b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 16 deletions.
diff --git a/src/oscript/CgiBehavior.cs b/src/oscript/CgiBehavior.cs
@@ -61,8 +61,8 @@ public override int Execute()
 
 		private int RunCGIMode(string scriptFile)
 		{
-			var builder = ConsoleHostBuilder.Create();
-			builder.UseEntrypointConfigFile(scriptFile)
+			var builder = ConsoleHostBuilder
+				.Create(scriptFile)
 				.AddAssembly(Assembly.GetExecutingAssembly());
 
 			var engine = ConsoleHostBuilder.Build(builder);

diff --git a/src/oscript/CheckSyntaxBehavior.cs b/src/oscript/CheckSyntaxBehavior.cs
@@ -34,8 +34,7 @@ public CheckSyntaxBehavior(string path, string envFile, bool isCgi = false)
 
 		public override int Execute()
 		{
-			var builder = ConsoleHostBuilder.Create();
-			builder.UseEntrypointConfigFile(_path);
+			var builder = ConsoleHostBuilder.Create(_path);
 			var hostedScript = ConsoleHostBuilder.Build(builder);
 			hostedScript.Initialize();
 

diff --git a/src/oscript/ConsoleHostBuilder.cs b/src/oscript/ConsoleHostBuilder.cs
@@ -19,13 +19,14 @@ namespace oscript
 {
     internal static class ConsoleHostBuilder
     {
-        public static IEngineBuilder Create()
+        public static IEngineBuilder Create(string codePath)
         {
             var builder = new DefaultEngineBuilder();
             builder.SetDefaultOptions()
                 .AddAssembly(typeof(ArrayImpl).Assembly)
                 .UseSystemConfigFile()
-                .UseEnvironmentVariableConfig("OSCRIPT_CONFIG");
+                .UseEnvironmentVariableConfig("OSCRIPT_CONFIG")
+                .UseEntrypointConfigFile(codePath);
 
             builder.UseFileSystemLibraries();
 

diff --git a/src/oscript/ExecuteScriptBehavior.cs b/src/oscript/ExecuteScriptBehavior.cs
@@ -44,10 +44,8 @@ public override int Execute()
 
             SystemLogger.SetWriter(this);
 
-            var builder = ConsoleHostBuilder.Create();
-            builder
-                 .UseEntrypointConfigFile(_path)
-                 .WithDebugger(DebugController);
+            var builder = ConsoleHostBuilder.Create(_path);
+            builder.WithDebugger(DebugController);
 
             var hostedScript = ConsoleHostBuilder.Build(builder);
 

diff --git a/src/oscript/MakeAppBehavior.cs b/src/oscript/MakeAppBehavior.cs
@@ -59,7 +59,7 @@ private void CreateDump(Stream output)
 	    {
 	        var offset = (int)output.Length;
 
-	        var builder = ConsoleHostBuilder.Create();
+	        var builder = ConsoleHostBuilder.Create(_codePath);
 	        builder.UseEntrypointConfigFile(_codePath);
 	        var engine = ConsoleHostBuilder.Build(builder);
 	        engine.Initialize();

diff --git a/src/oscript/SerializeModuleBehavior.cs b/src/oscript/SerializeModuleBehavior.cs
@@ -30,8 +30,7 @@ public SerializeModuleBehavior(string path)
 
         public override int Execute()
         {
-            var builder = ConsoleHostBuilder.Create();
-            builder.UseEntrypointConfigFile(_path);
+            var builder = ConsoleHostBuilder.Create(_path);
             var engine = ConsoleHostBuilder.Build(builder);
 
             engine.Initialize();

diff --git a/src/oscript/ShowCompiledBehavior.cs b/src/oscript/ShowCompiledBehavior.cs
@@ -29,9 +29,7 @@ public ShowCompiledBehavior(string path)
 
 		public override int Execute()
 		{
-			var builder = ConsoleHostBuilder.Create();
-			builder.UseEntrypointConfigFile(_path);
-
+			var builder = ConsoleHostBuilder.Create(_path);
 			var hostedScript = ConsoleHostBuilder.Build(builder);
 			hostedScript.Initialize();
 			ScriptFileHelper.OnBeforeScriptRead(hostedScript);