enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-24 16:21:37 +03:00
Code Issues Projects Releases Wiki Activity

Install GraalVM components before move (#1660)

Browse Source 
Install the required GraalVM components before 
moving the directory.
This commit is contained in:
Dmitry Bushev 2021-04-09 12:09:54 +03:00 committed by GitHub
parent 9f60e22508
commit 0aa5b5647e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManager.scala
View File

@ -697,11 +697,16 @@ class RuntimeVersionManager(
}
try {
val temporaryRuntime = loadGraalRuntime(runtimeTemporaryPath)
if (temporaryRuntime.isFailure) {
val temporaryRuntime =
loadGraalRuntime(runtimeTemporaryPath).getOrElse {
throw InstallationError(
"Cannot load the installed runtime. The package may have been " +
"corrupted. Reverting installation."
)
}
installRequiredRuntimeComponents(temporaryRuntime, os).getOrElse {
throw InstallationError(
"Cannot load the installed runtime. The package may have been " +
"corrupted. Reverting installation."
"fatal: Cannot install the required runtime components."
)
}
@ -714,13 +719,6 @@ class RuntimeVersionManager(
"fatal: Cannot load the installed runtime."
)
}
installRequiredRuntimeComponents(runtime, os).getOrElse {
FileSystem.removeDirectory(runtimePath)
throw InstallationError(
"fatal: Cannot install the required runtime components."
)
}
userInterface.logInfo(s"Installed $runtime.")
runtime