Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update link to JS style guide #1408

Merged
merged 3 commits into from
Jun 7, 2016
Merged

Update link to JS style guide #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa8ade2
Update link to JS style guide
process-bot Jun 7, 2016
c454cf4
Bump to 0.17.1
process-bot Jun 7, 2016
1950b46
Fix #1286, support --version flag
process-bot Jun 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ and send it to <[email protected]> before opening your pull request.
* JavaScript &mdash; use [Google's JS style guide][js]

[haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be
[js]: https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml
[js]: https://google.github.io/styleguide/javascriptguide.xml

## Branches

Expand Down
2 changes: 1 addition & 1 deletion elm-compiler.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

Name: elm-compiler
Version: 0.17
Version: 0.17.1

Synopsis:
Values to help with elm-package, elm-make, and elm-lang.org.
Expand Down
10 changes: 9 additions & 1 deletion src/CommandLineRouter.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import GHC.IO.Encoding (setLocaleEncoding, utf8)
import qualified Elm.Compiler.Version as Compiler
import qualified Elm.Package as Pkg



main :: IO ()
main =
do setLocaleEncoding utf8
Expand All @@ -19,6 +21,12 @@ main =
[] ->
putStrLn usageMessage

"--version" ->
putStrLn $ Pkg.versionToString Compiler.version

"-v" ->
putStrLn $ Pkg.versionToString Compiler.version

command : args ->
attemptToRun command args

Expand Down Expand Up @@ -50,7 +58,7 @@ attemptToRun command args =

usageMessage :: String
usageMessage =
"Elm Platform " ++ (Pkg.versionToString Compiler.version) ++ " - a way to run all Elm tools\n\
"Elm Platform " ++ Pkg.versionToString Compiler.version ++ " - a way to run all Elm tools\n\
\\n\
\Usage: elm <command> [<args>]\n\
\\n\
Expand Down