Merge pull request #17 from BaseMC/develop

Fixed path to jre
BaseMC · Mar 2, 2020 · eaaa7ba · eaaa7ba
2 parents f46a21e + b7db41c
commit eaaa7ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Aves/Runner.cs b/Aves/Runner.cs
@@ -195,7 +195,7 @@ private string TryFindJavaExe()
                return javaExePath;
             }
             else
-               Log.Warn("Found location of java in configuration, but was invalid. Trying to find java...");
+               Log.Warn($"Found location of java[='{javaExePath}'] in configuration, but was invalid. Trying to find java...");
          }
 
          javaExePath = Environment.GetEnvironmentVariable("JAVA_HOME");
@@ -241,7 +241,7 @@ private string BuildPath(string name, string path, string relativeParent)
 
       private string BuildPathForExecutableLocation(string name, string path)
       {
-         return PathBuilder.BuildPath(name, path, AppDomain.CurrentDomain.BaseDirectory);
+         return PathBuilder.BuildPath(name, path, Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName));
       }
 
       #endregion Init

diff --git a/Aves/packages.lock.json b/Aves/packages.lock.json
@@ -269,7 +269,7 @@
       "aves.shared": {
         "type": "Project",
         "dependencies": {
-          "CoreFrameworkBase": "1.0.7365.34504"
+          "CoreFrameworkBase": "1.0.7366.38236"
         }
       },
       "coreframeworkbase": {