git.iko.soy/elk
on master help sign in
Update elm-server to work with new module structure
145d4b9Timothy Vladimír Hobbs
server/Server.hs+4−4
compare with master
unifiedsplit
@@ -12,7 +12,7 @@ import System.Exit
12import System.FilePath
12import System.FilePath
13import System.Process
13import System.Process
14import GHC.IO.Handle
14import GHC.IO.Handle
15−import qualified Language.Elm as Elm
15+import qualified Elm.Internal.Paths as ElmPaths
16import Paths_elm_server
16import Paths_elm_server
17
17
18runtime = "/elm-runtime.js"
18runtime = "/elm-runtime.js"
@@ -74,7 +74,7 @@ parse ("--help":_) = putStrLn usage
74parse ("--version":_) = putStrLn ("The Elm Server " ++ showVersion version)
74parse ("--version":_) = putStrLn ("The Elm Server " ++ showVersion version)
75parse args =
75parse args =
76 if null remainingArgs then
76 if null remainingArgs then
77− serve portNumber =<< elmRuntime
77+ serve portNumber elmRuntime
78 else
78 else
79 putStrLn usageMini
79 putStrLn usageMini
80
80
@@ -86,9 +86,9 @@ parse args =
86 argValue arg = tail $ dropWhile (/= '=') (head arg)
86 argValue arg = tail $ dropWhile (/= '=') (head arg)
87 portNumber = if null portArg then 8000 else read (argValue portArg) :: Int
87 portNumber = if null portArg then 8000 else read (argValue portArg) :: Int
88 elmRuntime = if null runtimeArg then
88 elmRuntime = if null runtimeArg then
89− Elm.runtime
89+ ElmPaths.runtime
90 else
90 else
91− return $ argValue runtimeArg
91+ argValue runtimeArg
92
92
93usageMini :: String
93usageMini :: String
94usageMini =
94usageMini =