From 387b05605e2c55fc829cbf15af221be5dbd171cd Mon Sep 17 00:00:00 2001 From: Luke Nadur <19835357+intricate@users.noreply.github.com> Date: Tue, 14 Jul 2020 12:28:18 -0400 Subject: [PATCH 1/2] Add bash autocompletion to more FilePath parsers in the Byron CLI --- cardano-cli/src/Cardano/CLI/Byron/Parsers.hs | 1 + cardano-config/src/Cardano/Config/Parsers.hs | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs b/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs index d47b1a78e34..db60b84be7a 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs @@ -349,6 +349,7 @@ parseTxRelatedValues = parseVerificationKeyFile :: String -> String -> Parser VerificationKeyFile parseVerificationKeyFile opt desc = VerificationKeyFile <$> parseFilePath opt desc + pNodeCmd :: Parser NodeCmd pNodeCmd = Opt.subparser $ diff --git a/cardano-config/src/Cardano/Config/Parsers.hs b/cardano-config/src/Cardano/Config/Parsers.hs index a0b80488ee4..de65cdfd3f4 100644 --- a/cardano-config/src/Cardano/Config/Parsers.hs +++ b/cardano-config/src/Cardano/Config/Parsers.hs @@ -63,6 +63,7 @@ parseDbPath = ( long "database-path" <> metavar "FILEPATH" <> help "Directory where the state is stored." + <> completer (bashCompleter "file") ) @@ -74,7 +75,12 @@ parseGenesisFile opt = parseFilePath :: String -> String -> Parser FilePath parseFilePath optname desc = - strOption $ long optname <> metavar "FILEPATH" <> help desc + strOption + ( long optname + <> metavar "FILEPATH" + <> help desc + <> completer (bashCompleter "file") + ) parseFraction :: String -> String -> Parser Rational parseFraction optname desc = From d22cad79f56090597343423a7f3ec641ac28ae11 Mon Sep 17 00:00:00 2001 From: Luke Nadur <19835357+intricate@users.noreply.github.com> Date: Tue, 14 Jul 2020 12:30:14 -0400 Subject: [PATCH 2/2] Add bash autocompletion to FilePath parsers in the cardano-node CLI --- cardano-node/src/Cardano/Node/Parsers.hs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cardano-node/src/Cardano/Node/Parsers.hs b/cardano-node/src/Cardano/Node/Parsers.hs index a874b3d6561..49498c78b16 100644 --- a/cardano-node/src/Cardano/Node/Parsers.hs +++ b/cardano-node/src/Cardano/Node/Parsers.hs @@ -151,6 +151,7 @@ parseTopologyFile = long "topology" <> metavar "FILEPATH" <> help "The path to a file describing the topology." + <> completer (bashCompleter "file") ) parseDelegationCert :: Parser FilePath @@ -159,6 +160,7 @@ parseDelegationCert = ( long "delegation-certificate" <> metavar "FILEPATH" <> help "Path to the delegation certificate." + <> completer (bashCompleter "file") ) parseSigningKey :: Parser FilePath @@ -167,6 +169,7 @@ parseSigningKey = ( long "signing-key" <> metavar "FILEPATH" <> help "Path to the signing key." + <> completer (bashCompleter "file") ) parseOperationalCertFilePath :: Parser FilePath @@ -175,6 +178,7 @@ parseOperationalCertFilePath = ( long "shelley-operational-certificate" <> metavar "FILEPATH" <> help "Path to the delegation certificate." + <> completer (bashCompleter "file") ) --TODO: pass the current KES evolution, not the KES_0 @@ -184,6 +188,7 @@ parseKesKeyFilePath = ( long "shelley-kes-key" <> metavar "FILEPATH" <> help "Path to the KES signing key." + <> completer (bashCompleter "file") ) parseVrfKeyFilePath :: Parser FilePath @@ -192,4 +197,5 @@ parseVrfKeyFilePath = ( long "shelley-vrf-key" <> metavar "FILEPATH" <> help "Path to the VRF signing key." + <> completer (bashCompleter "file") )