Skip to content

Commit

Permalink
Fix scala server issues (#1060)
Browse files Browse the repository at this point in the history
- Update default value when the OE_LIB_DIR environment variable is not set.
- Utilization of custom OE_LIB_DIR path seemed to work okay.

Closes #982
  • Loading branch information
shanedell authored Jan 24, 2025
1 parent 9f97e5e commit 9dfc53d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
8 changes: 7 additions & 1 deletion server/scala/project/BuildSupport.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ object BuildSupport {
}
case class Arch(id: String, _id: String, os: String, arch: String)
val libdir: String = new java.io.File(
sys.env.getOrElse("OE_LIB_DIR", "../../_install")
sys.env.getOrElse(
"OE_LIB_DIR",
"../../_install/" + (System.getProperty("os.name").toLowerCase.startsWith("win") match {
case true => "bin"
case false => "lib"
})
)
).toPath.toAbsolutePath.normalize.toString // get full path as relative can cause issues
val apacheLicenseUrl: URL = new URL(
"https://www.apache.org/licenses/LICENSE-2.0.txt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ class EditorService(implicit val system: ActorSystem) extends Editor {
ObjectId(in.id) match {
case Viewport.Id(sid, vid) =>
(editors ? ViewportOp(sid, vid, Viewport.Unwatch)).mapTo[Result].map {
case Ok(_) => in
case Ok(_) => in
case Err(c) => throw grpcFailure(c)
}
case _ =>
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2067,10 +2067,10 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==

[email protected].0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/pid-port/-/pid-port-1.0.0.tgz#b99a4d53dfeeae8b4e123d02c77e268de0413225"
integrity sha512-LSNBeKChRPA4Xlrs6+zV588G1hSrFvANtPV5rt/5MPfSPK3V9XPWxx1d29svsrOjngT9ifLisXWCLS7DvO9ZhQ==
[email protected].1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/pid-port/-/pid-port-1.0.1.tgz#89b17c8c0390d03981d8f70879f1928ff16ebd8a"
integrity sha512-LgNj9suJjJqCRtOC93KAB1q4IyuhNbhyvL9L1Phvi9Qbe32E26R6ooJLDlG5/OvSqU/ywTppH3Grc+jmdcJjpw==
dependencies:
execa "^8.0.1"

Expand Down

0 comments on commit 9dfc53d

Please sign in to comment.