diff options
| author | John MacFarlane <[email protected]> | 2025-07-13 12:23:56 -0700 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2025-07-13 12:23:56 -0700 |
| commit | 2e3cb483e9d2367b0fbd308e33c33cbb9995fc64 (patch) | |
| tree | bd9c4b6d5421bb8e93d013f5476d2e4d4f22300c | |
| parent | 9d7996ea2b7c04b0a327eb5aca7538cf4c899a16 (diff) | |
Use hardcoded string "pandoc" for program name in `--version`.
Per GNU guidelines:
https://www.gnu.org/prep/standards/html_node/_002d_002dversion.html
| -rw-r--r-- | pandoc-cli/src/pandoc.hs | 3 | ||||
| -rw-r--r-- | src/Text/Pandoc/App/CommandLineOptions.hs | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pandoc-cli/src/pandoc.hs b/pandoc-cli/src/pandoc.hs index 019d0aded..9e82d02bc 100644 --- a/pandoc-cli/src/pandoc.hs +++ b/pandoc-cli/src/pandoc.hs @@ -91,11 +91,10 @@ flagSettings = "Features: " ++ versionInfo :: IO () versionInfo = do - progname <- getProgName defaultDatadir <- defaultUserDataDir scriptingEngine <- getEngine UTF8.putStr $ T.unlines $ map T.pack - [ progname ++ " " ++ showVersion pandocVersion ++ versionSuffix + [ "pandoc " ++ showVersion pandocVersion ++ versionSuffix , flagSettings , "Scripting engine: " ++ T.unpack (engineName scriptingEngine) , "User data directory: " ++ defaultDatadir diff --git a/src/Text/Pandoc/App/CommandLineOptions.hs b/src/Text/Pandoc/App/CommandLineOptions.hs index 22a6bafa9..db7d5a1ac 100644 --- a/src/Text/Pandoc/App/CommandLineOptions.hs +++ b/src/Text/Pandoc/App/CommandLineOptions.hs @@ -194,11 +194,10 @@ handleOptInfo engine info = E.handle (handleError . Left) $ do ,confNumFormat = Generic ,confTrailingNewline = True} sty VersionInfo -> do - prg <- getProgName defaultDatadir <- defaultUserDataDir UTF8.hPutStrLn stdout $ T.pack - $ prg ++ " " ++ T.unpack pandocVersionText ++ + $ "pandoc " ++ T.unpack pandocVersionText ++ "\nUser data directory: " ++ defaultDatadir ++ ('\n':copyrightMessage) Help -> do |