Merge remote-tracking branch 'origin/master'

psibi · Jul 27, 2017 · 6ca5754 · 6ca5754
2 parents 74ffa9e + 1b8495a
commit 6ca5754
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 0.2.2
+
+* Fix `--version` option
+
+# 0.2.1
+
+* Fix background color [bug](https://github.com/psibi/tldr-hs/pull/3)
+
 # 0.2.0
 
 * Compliance with the tldr spec

diff --git a/app/Main.hs b/app/Main.hs
@@ -10,6 +10,8 @@ import System.Directory
 import System.FilePath
 import Data.Conduit.Shell hiding (info)
 import System.Environment (getArgs, withArgs)
+import Paths_tldr (version)
+import Data.Version (showVersion)
 
 data TldrOpts = TldrOpts
   { pageName :: String
@@ -65,7 +67,7 @@ tldrParserInfo =
   where
     versionOption :: Parser (a -> a)
     versionOption =
-      infoOption "0.1" (long "version" <> short 'v' <> help "Show version")
+      infoOption (showVersion version) (long "version" <> short 'v' <> help "Show version")
 
 programOptions :: Parser TldrOpts
 programOptions =

diff --git a/src/Tldr.hs b/src/Tldr.hs
@@ -24,7 +24,6 @@ data ConsoleSetting = ConsoleSetting
   , fgIntensity :: ColorIntensity
   , fgColor :: Color
   , bgIntensity :: ColorIntensity
-  , bgColor :: Color
   , consoleIntensity :: ConsoleIntensity
   }
 
@@ -37,7 +36,6 @@ defConsoleSetting =
   , fgIntensity = Dull
   , fgColor = White
   , bgIntensity = Dull
-  , bgColor = Black
   , consoleIntensity = NormalIntensity
   }
 
@@ -54,7 +52,6 @@ toSGR cons =
   , SetUnderlining (underline cons)
   , SetBlinkSpeed (blink cons)
   , SetColor Foreground (fgIntensity cons) (fgColor cons)
-  , SetColor Background (bgIntensity cons) (bgColor cons)
   ]
 
 renderNode :: NodeType -> IO ()

diff --git a/stack.yaml b/stack.yaml
@@ -15,7 +15,7 @@
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-2.22
+resolver: lts-8.4
 
 
 

diff --git a/tldr.cabal b/tldr.cabal
@@ -1,5 +1,5 @@
 name:                tldr
-version:             0.2.0
+version:             0.2.2
 synopsis:            Haskell tldr client
 description:         Haskell tldr client with support for updating and viewing tldr pages.
 homepage:            https://github.com/psibi/tldr-hs#readme