Fixed the program name in help/usage/version text.
parent
53e70d6ead
commit
86a3cc0448
|
@ -9,8 +9,9 @@ import qualified Distribution.PackageDescription as P
|
||||||
import qualified Distribution.CurrentPackageDescription as P
|
import qualified Distribution.CurrentPackageDescription as P
|
||||||
import qualified Distribution.Text as DText
|
import qualified Distribution.Text as DText
|
||||||
|
|
||||||
import Data.List (intercalate)
|
import Data.List (intercalate)
|
||||||
import Options.Applicative
|
import Options.Applicative
|
||||||
|
import System.Environment (getProgName)
|
||||||
|
|
||||||
import Ringo.Types
|
import Ringo.Types
|
||||||
|
|
||||||
|
@ -100,20 +101,19 @@ progArgsParser =
|
||||||
<> action "directory"
|
<> action "directory"
|
||||||
<> help "Output directory")
|
<> help "Output directory")
|
||||||
|
|
||||||
progName :: String
|
versionParser :: String -> Parser (a -> a)
|
||||||
progName = $(P.getField (DText.display . P.pkgName . P.package))
|
versionParser progName = infoOption (progName ++ " " ++ version)
|
||||||
|
|
||||||
versionParser :: Parser (a -> a)
|
|
||||||
versionParser = infoOption (progName ++ " " ++ version)
|
|
||||||
(long "version"
|
(long "version"
|
||||||
<> help "Print version information")
|
<> help "Print version information")
|
||||||
where
|
where
|
||||||
version = $(P.getField (DText.display . P.pkgVersion . P.package))
|
version = $(P.getField (DText.display . P.pkgVersion . P.package))
|
||||||
|
|
||||||
parseArgs :: IO ProgArgs
|
parseArgs :: IO ProgArgs
|
||||||
parseArgs = execParser $
|
parseArgs = do
|
||||||
info (helper <*> versionParser <*> progArgsParser)
|
progName <- getProgName
|
||||||
(fullDesc
|
execParser $
|
||||||
<> progDesc $(P.getField P.description)
|
info (helper <*> versionParser progName <*> progArgsParser)
|
||||||
<> header (progName ++ " - " ++ $(P.getField P.synopsis))
|
(fullDesc
|
||||||
<> footer ("© " ++ $(P.getField P.copyright) ++ ". " ++ $(P.getField P.homepage)))
|
<> progDesc $(P.getField P.description)
|
||||||
|
<> header (progName ++ " - " ++ $(P.getField P.synopsis))
|
||||||
|
<> footer ("© " ++ $(P.getField P.copyright) ++ ". " ++ $(P.getField P.homepage)))
|
||||||
|
|
Loading…
Reference in New Issue