abhin4v
/
ringo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed the program name in help/usage/version text.

pull/1/head
Abhinav Sarkar 2016-05-05 01:29:20 +05:30
parent 53e70d6ead
commit 86a3cc0448
No known key found for this signature in database
GPG Key ID: 7C9166A6F5465AD5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ringo-app/src/Ringo/ArgParser.hs
View File

@ -9,8 +9,9 @@ import qualified Distribution.PackageDescription as P
import qualified Distribution.CurrentPackageDescription as P
import qualified Distribution.Text as DText
import Data.List (intercalate)
import Data.List (intercalate)
import Options.Applicative
import System.Environment (getProgName)
import Ringo.Types
@ -100,20 +101,19 @@ progArgsParser =
<> action "directory"
<> help "Output directory")
progName :: String
progName = $(P.getField (DText.display . P.pkgName . P.package))
versionParser :: Parser (a -> a)
versionParser = infoOption (progName ++ " " ++ version)
versionParser :: String -> Parser (a -> a)
versionParser progName = infoOption (progName ++ " " ++ version)
(long "version"
<> help "Print version information")
where
version = $(P.getField (DText.display . P.pkgVersion . P.package))
parseArgs :: IO ProgArgs
parseArgs = execParser $
info (helper <*> versionParser <*> progArgsParser)
(fullDesc
<> progDesc $(P.getField P.description)
<> header (progName ++ " - " ++ $(P.getField P.synopsis))
<> footer ("© " ++ $(P.getField P.copyright) ++ ". " ++ $(P.getField P.homepage)))
parseArgs = do
progName <- getProgName
execParser $
info (helper <*> versionParser progName <*> progArgsParser)
(fullDesc
<> progDesc $(P.getField P.description)
<> header (progName ++ " - " ++ $(P.getField P.synopsis))
<> footer ("© " ++ $(P.getField P.copyright) ++ ". " ++ $(P.getField P.homepage)))