unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-10-05 14:17:33 +03:00
Code Issues Projects Releases Wiki Activity

better error message when scala is not found on the path #295

Browse Source
This commit is contained in:
Francis De Brabandere 2019-01-21 11:34:31 +01:00
parent 055c898522
commit c220fee7e9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
parser-typechecker/src/Unison/Codebase/Runtime/JVM.hs
View File

@ -17,6 +17,7 @@ import Network.Socket
import System.IO.Streams ( InputStream
, OutputStream
)
import System.Directory ( findExecutable)
import qualified System.IO.Streams as Streams
import qualified System.IO.Streams.ByteString as BSS
import qualified System.IO.Streams.Network as N
@ -88,7 +89,11 @@ javaRuntime getv suggestedPort = do
let cmd = "scala"
args = ["-cp", "runtime-jvm/.bloop/main/scala-2.12/classes",
"org.unisonweb.BootstrapStream", show port]
(_,_,_,ph) <- P.createProcess (P.proc cmd args) { P.cwd = Just "." }
(socket, _address) <- accept listenSock -- accept a connection and handle it
(input, output) <- N.socketToStreams socket
pure (P.terminateProcess ph, input, output)
exe <- findExecutable cmd
case exe of
Just _ -> do
(_,_,_,ph) <- P.createProcess (P.proc cmd args) { P.cwd = Just "." }
(socket, _address) <- accept listenSock -- accept a connection and handle it
(input, output) <- N.socketToStreams socket
pure (P.terminateProcess ph, input, output)
Nothing -> fail $ cmd ++ " executable not found, Unison needs a matching scala version available on the path"