tldr 0.6.0 → 0.6.1

raw patch · 3 files changed

+32/−14 lines, 3 files

Files

• CHANGELOG.md +4/−0
• app/Main.hs +27/−13
• tldr.cabal +1/−1

@@ -1,3 +1,7 @@+# 0.6.1++* Implement --about option+ # 0.6.0  * Make it obey --platform option

@@ -15,30 +15,29 @@ import Options.Applicative import Paths_tldr (version) import System.Directory-import System.Environment (getArgs)+import System.Environment (getArgs, getExecutablePath) import System.FilePath import System.Process.Typed import Tldr -data TldrOpts =-  TldrOpts-    { tldrAction :: TldrCommand-    }-  deriving (Show)+data TldrOpts = TldrOpts+  { tldrAction :: TldrCommand+  } deriving (Show)  data TldrCommand   = UpdateIndex-  | ViewPage ViewOptions [String]+  | ViewPage ViewOptions+             [String]+  | About   deriving (Show, Eq, Ord) -data ViewOptions =-  ViewOptions-    { platformOption :: Maybe String-    }-  deriving (Show, Eq, Ord)+data ViewOptions = ViewOptions+  { platformOption :: Maybe String+  } deriving (Show, Eq, Ord)  programOptions :: Parser TldrOpts-programOptions = (TldrOpts <$> (updateIndexCommand <|> viewPageCommand))+programOptions =+  (TldrOpts <$> (updateIndexCommand <|> viewPageCommand <|> aboutFlag))  updateIndexCommand :: Parser TldrCommand updateIndexCommand =@@ -46,6 +45,9 @@     UpdateIndex     (long "update" <> short 'u' <> help "Update offline cache of tldr pages") +aboutFlag :: Parser TldrCommand+aboutFlag = flag' About (long "about" <> short 'a' <> help "About this program")+ viewOptionsParser :: Parser ViewOptions viewOptionsParser = ViewOptions <$> platformFlag @@ -147,10 +149,22 @@       | a `Set.member` s = loop s as       | otherwise = a : loop (Set.insert a s) as +handleAboutFlag :: IO ()+handleAboutFlag = do+  path <- getExecutablePath+  let content =+        unlines+          [ path <> " v" <> (showVersion version)+          , "Copyright (C) 2017 Sibi Prabakaran"+          , "Source available at https://github.com/psibi/tldr-hs"+          ]+  putStr content+ handleTldrOpts :: TldrOpts -> IO () handleTldrOpts TldrOpts {..} = do   case tldrAction of     UpdateIndex -> updateTldrPages+    About -> handleAboutFlag     ViewPage voptions pages -> do       let npage = intercalate "-" pages       fname <- getPagePath npage (getCheckDirs voptions)

@@ -1,5 +1,5 @@ name:                tldr-version:             0.6.0+version:             0.6.1 synopsis:            Haskell tldr client description:         Haskell tldr client with support for viewing tldr pages. Has offline                      cache for accessing pages. Visit https://tldr.sh for more details.