git.iko.soy/elk
on master help sign in
Merge pull request #1408 from elm-lang/dev

Update link to JS style guide

commite610efe98ec5b9f7eda6153df357bd1d10a887e9 authorEvan Czaplicki <info@elm-lang.org> dateTue 7 Jun 2016, 11:59 (10 years ago) parentaf58e921950b46
3 files changed+11−3
compare with master
unifiedsplit
CONTRIBUTING.md+1−1 elm-compiler.cabal+1−1 src/CommandLineRouter.hs+9−1
CONTRIBUTING.md+1−1
@@ -15,7 +15,7 @@ and send it to <info@elm-lang.org> before opening your pull request.
1515 * JavaScript &mdash; use [Google's JS style guide][js]
1616
1717[haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be
18−[js]: https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml
18+[js]: https://google.github.io/styleguide/javascriptguide.xml
1919
2020## Branches
2121
elm-compiler.cabal+1−1
@@ -1,6 +1,6 @@
11
22Name: elm-compiler
3−Version: 0.17
3+Version: 0.17.1
44
55Synopsis:
66 Values to help with elm-package, elm-make, and elm-lang.org.
src/CommandLineRouter.hs+9−1
@@ -10,6 +10,8 @@ import GHC.IO.Encoding (setLocaleEncoding, utf8)
1010import qualified Elm.Compiler.Version as Compiler
1111import qualified Elm.Package as Pkg
1212
13+
14+
1315main :: IO ()
1416main =
1517 do setLocaleEncoding utf8
@@ -19,6 +21,12 @@ main =
1921 [] ->
2022 putStrLn usageMessage
2123
24+ "--version" ->
25+ putStrLn $ Pkg.versionToString Compiler.version
26+
27+ "-v" ->
28+ putStrLn $ Pkg.versionToString Compiler.version
29+
2230 command : args ->
2331 attemptToRun command args
2432
@@ -50,7 +58,7 @@ attemptToRun command args =
5058
5159usageMessage :: String
5260usageMessage =
53− "Elm Platform " ++ (Pkg.versionToString Compiler.version) ++ " - a way to run all Elm tools\n\
61+ "Elm Platform " ++ Pkg.versionToString Compiler.version ++ " - a way to run all Elm tools\n\
5462 \\n\
5563 \Usage: elm <command> [<args>]\n\
5664 \\n\