Merge 5359bbf0e7 into 35228e5ac0

2025-09-04 00:57:18 +00:00
3 changed files with 159 additions and 166 deletions
--- a/src/_bitcoin-cli
+++ b/src/_bitcoin-cli
@ -28,14 +28,14 @@
 # Description
 # -----------
 #
-#  Completion script for bitcoin-cli v29.0.0 (https://bitcoin.org).
+#  Completion script for bitcoin-cli (https://bitcoin.org).
 #
 # ------------------------------------------------------------------------------
 # Authors
 # -------
 #
 #  * Ian Ker-Seymer (https://github.com/ianks)
-#  * notmike (https://github.com/notmike-5)
+#  * notmike
 # ------------------------------------------------------------------------------

 _bitcoin-cli() {
@ -43,24 +43,21 @@ _bitcoin-cli() {

  _arguments -C \
    -?'[This help message]' \
-    -addrinfo'[Get the number of addresses known to the node, per network and total]' \
+    -addrinfo'[Get the number of addresses known to the node, per network and total, after filtering for quality and recency. Total number of addresses known to the node may be higher.]' \
    -chain='[Use the chain <chain> (default: main). Allowed values: main, test, signet, regtest]:chain:(main test signet regtest)' \
-    -color='[Color setting for CLI output (default: auto)]:when:(always auto never)' \
+    -color='[Color setting for CLI output (default: auto). Valid values: always, auto, never]:when:(always auto never)' \
    -conf='[Specify configuration file. Relative paths will be prefixed by datadir location. (default: bitcoin.conf)]:PATH:_files' \
    -datadir='[Specify data directory]:PATH:_directories' \
-    -getinfo'[Get general information from the remote server]' \
+    -getinfo='[Get general information from the remote server.]' \
    -testnet'[Use the test chain]' \
-    -regtest'[Enter regression test mode]' \
+    -regtest'[Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.]' \
    -named'[Pass named instead of positional arguments (default: false)]' \
    -netinfo=-'[Get network peer connection information from the remote server.]::level_or_help:(0 1 2 3 4 help)' \
-    -stdin'[Read extra arguments from standard input, one per line until EOF/Ctrl-D]' \
+    -stdin'[Read extra arguments from standard input, one per line until EOF/Ctrl-D (recommended for sensitive information such as passphrases)]' \
    -rpcport='[Connect to JSON-RPC on <port> (default: 8332, testnet: 18332, regtest: 18443)]: :_guard "[[\:digit\:]]#" "PORT"' \
    -rpcwait'[Wait for RPC server to start]' \
-    -rpcwaittimeout='[Timeout in seconds to wait for the RPC server to start, or 0 for no timeout. (default: 0)]:timeout' \
    -rpcuser='[Username for JSON-RPC connections]:RPCUSER:()' \
    -rpcpassword='[Password for JSON-RPC connections]:RPCPASSWORD:()' \
-    -rpccookiefile='[Location of the auth cookie(default: data dir)]:dir:_files' \
-    -rpcwallet='[Send RPC for non-default wallet on RPC server]:server' \
    -rpcconnect='[Send commands to node running on <ip> (default: 127.0.0.1)]:RPCCONNECT:_hosts' \
    -rpcclienttimeout='[Timeout during HTTP requests, or 0 for no timeout. (default: 900)]: :_guard "[[\:digit\:]]#" "RPCCLIENTTIMEOUT"' \
    -version'[Print version and exit]' \
@ -68,155 +65,153 @@ _bitcoin-cli() {

  case $state in
    subcommand)
-      subcommands=(
-        'dumptxoutset'
-        'getbestblockhash'
-        'getblock'
-        'getblockchaininfo'
-        'getblockcount'
-        'getblockfilter'
-        'getblockfrompeer'
-        'getblockhash'
-        'getblockheader'
-        'getblockstats'
-        'getchainstates'
-        'getchaintips'
-        'getchaintxstats'
-        'getdeploymentinfo'
-        'getdifficulty'
-        'getmempoolancestors'
-        'getmempooldescendants'
-        'getmempoolentry'
-        'getmempoolinfo'
-        'getrawmempool'
-        'gettxout'
-        'gettxoutproof'
-        'gettxoutsetinfo'
-        'gettxspendingprevout'
-        'importmempool'
-        'loadtxoutset'
-        'preciousblock'
-        'pruneblockchain'
-        'savemempool'
-        'scanblocks'
-        'scantxoutset'
-        'verifychain'
-        'verifytxoutproof'
-        'getmemoryinfo'
-        'getrpcinfo'
-        'help'
-        'logging'
-        'stop'
-        'uptime'
-        'getblocktemplate'
-        'getmininginfo'
-        'getnetworkhashps'
-        'getprioritisedtransactions'
-        'prioritisetransaction'
-        'submitblock'
-        'submitheader'
-        'addnode'
-        'clearbanned'
-        'disconnectnode'
-        'getaddednodeinfo'
-        'getaddrmaninfo'
-        'getconnectioncount'
-        'getnettotals'
-        'getnetworkinfo'
-        'getnodeaddresses'
-        'getpeerinfo'
-        'listbanned'
-        'ping'
-        'setban'
-        'setnetworkactive'
-        'analyzepsbt'
-        'combinepsbt'
-        'combinerawtransaction'
-        'converttopsbt'
-        'createpsbt'
-        'createrawtransaction'
-        'decodepsbt'
-        'decoderawtransaction'
-        'decodescript'
-        'descriptorprocesspsbt'
-        'finalizepsbt'
-        'fundrawtransaction'
-        'getrawtransaction'
-        'joinpsbts'
-        'sendrawtransaction'
-        'signrawtransactionwithkey'
-        'submitpackage'
-        'testmempoolaccept'
-        'utxoupdatepsbt'
-        'enumeratesigners'
-        'createmultisig'
-        'deriveaddresses'
-        'estimatesmartfee'
-        'getdescriptorinfo'
-        'getindexinfo'
-        'signmessagewithprivkey'
-        'validateaddress'
-        'verifymessage'
-        'abandontransaction'
-        'abortrescan'
-        'backupwallet'
-        'bumpfee'
-        'createwallet'
-        'createwalletdescriptor'
-        'encryptwallet'
-        'getaddressesbylabel'
-        'getaddressinfo'
-        'getbalance'
-        'getbalances'
-        'gethdkeys'
-        'getnewaddress'
-        'getrawchangeaddress'
-        'getreceivedbyaddress'
-        'getreceivedbylabel'
-        'gettransaction'
-        'getunconfirmedbalance'
-        'getwalletinfo'
-        'importdescriptors'
-        'importprunedfunds'
-        'keypoolrefill'
-        'listaddressgroupings'
-        'listdescriptors'
-        'listlabels'
-        'listlockunspent'
-        'listreceivedbyaddress'
-        'listreceivedbylabel'
-        'listsinceblock'
-        'listtransactions'
-        'listunspent'
-        'listwalletdir'
-        'listwallets'
-        'loadwallet'
-        'lockunspent'
-        'migratewallet'
-        'psbtbumpfee'
-        'removeprunedfunds'
-        'rescanblockchain'
-        'restorewallet'
-        'send'
-        'sendall'
-        'sendmany'
-        'sendtoaddress'
-        'setlabel'
-        'settxfee'
-        'setwalletflag'
-        'signmessage'
-        'signrawtransactionwithwallet'
-        'simulaterawtransaction'
-        'unloadwallet'
-        'upgradewallet'
-        'walletcreatefundedpsbt'
-        'walletdisplayaddress'
-        'walletlock'
-        'walletpassphrase'
-        'walletpassphrasechange'
-        'walletprocesspsbt'
-        'getzmqnotifications'
-      )
+    subcommands=(
+      'getbestblockhash'
+      'getblock'
+      'getblockchaininfo'
+      'getblockcount'
+      'getblockfilter'
+      'getblockfrompeer'
+      'getblockhash'
+      'getblockheader'
+      'getblockstats'
+      'getchaintips'
+      'getchaintxstats'
+      'getdeploymentinfo'
+      'getdifficulty'
+      'getmempoolancestors'
+      'getmempooldescendants'
+      'getmempoolentry'
+      'getmempoolinfo'
+      'getrawmempool'
+      'gettxout'
+      'gettxoutproof'
+      'gettxoutsetinfo'
+      'gettxspendingprevout'
+      'preciousblock'
+      'pruneblockchain'
+      'savemempool'
+      'scantxoutset'
+      'verifychain'
+      'verifytxoutproof'
+      'getmemoryinfo'
+      'getrpcinfo'
+      'help'
+      'logging'
+      'stop'
+      'uptime'
+      'getblocktemplate'
+      'getmininginfo'
+      'getnetworkhashps'
+      'prioritisetransaction'
+      'submitblock'
+      'submitheader'
+      'addnode'
+      'clearbanned'
+      'disconnectnode'
+      'getaddednodeinfo'
+      'getconnectioncount'
+      'getnettotals'
+      'getnetworkinfo'
+      'getnodeaddresses'
+      'getpeerinfo'
+      'listbanned'
+      'ping'
+      'setban'
+      'setnetworkactive'
+      'analyzepsbt'
+      'combinepsbt'
+      'combinerawtransaction'
+      'converttopsbt'
+      'createpsbt'
+      'createrawtransaction'
+      'decodepsbt'
+      'decoderawtransaction'
+      'decodescript'
+      'finalizepsbt'
+      'fundrawtransaction'
+      'getrawtransaction'
+      'joinpsbts'
+      'sendrawtransaction'
+      'signrawtransactionwithkey'
+      'testmempoolaccept'
+      'utxoupdatepsbt'
+      'enumeratesigners'
+      'createmultisig'
+      'deriveaddresses'
+      'estimatesmartfee'
+      'getdescriptorinfo'
+      'signmessagewithprivkey'
+      'validateaddress'
+      'verifymessage'
+      'abandontransaction'
+      'abortrescan'
+      'addmultisigaddress'
+      'backupwallet'
+      'bumpfee'
+      'createwallet'
+      'dumpprivkey'
+      'dumpwallet'
+      'encryptwallet'
+      'getaddressesbylabel'
+      'getaddressinfo'
+      'getbalance'
+      'getbalances'
+      'getnewaddress'
+      'getrawchangeaddress'
+      'getreceivedbyaddress'
+      'getreceivedbylabel'
+      'gettransaction'
+      'getunconfirmedbalance'
+      'getwalletinfo'
+      'importaddress'
+      'importdescriptors'
+      'importmulti'
+      'importprivkey'
+      'importprunedfunds'
+      'importpubkey'
+      'importwallet'
+      'keypoolrefill'
+      'listaddressgroupings'
+      'listdescriptors'
+      'listlabels'
+      'listlockunspent'
+      'listreceivedbyaddress'
+      'listreceivedbylabel'
+      'listsinceblock'
+      'listtransactions'
+      'listunspent'
+      'listwalletdir'
+      'listwallets'
+      'loadwallet'
+      'lockunspent'
+      'migratewallet'
+      'newkeypool'
+      'psbtbumpfee'
+      'removeprunedfunds'
+      'rescanblockchain'
+      'restorewallet'
+      'send'
+      'sendall'
+      'sendmany'
+      'sendtoaddress'
+      'sethdseed'
+      'setlabel'
+      'settxfee'
+      'setwalletflag'
+      'signmessage'
+      'signrawtransactionwithwallet'
+      'simulaterawtransaction'
+      'unloadwallet'
+      'upgradewallet'
+      'walletcreatefundedpsbt'
+      'walletdisplayaddress'
+      'walletlock'
+      'walletpassphrase'
+      'walletpassphrasechange'
+      'walletprocesspsbt'
+      'getzmqnotifications'
+    )

    _describe -t subcommands 'bitcoin-cli subcommands' subcommands && ret=0
  esac
--- a/src/_chatblade
+++ b/src/_chatblade
@ -3,7 +3,7 @@
 # Description
 # -----------
 #
-#  Completion script for chatblade 0.7.0 (https://github.com/npiv/chatblade)
+#  Completion script for chatblade (https://github.com/npiv/chatblade)
 #
 # ------------------------------------------------------------------------------
 # Authors
@ -20,11 +20,9 @@ _chatblade() {

  args+=(
    '(- *)'{-h,--help}'[show this help message and exit]'
-    '(- *)--version[display the chatblade version]'
    '--openai-api-key[the OpenAI API key can also be set as env variable OPENAI_API_KEY]:key'
-    '--openai-base-url[a custom URL to use the openAI against a local or custom model]:key'
    '--temperature[temperature (openai setting)]:temperature'
-    '(-c --chat-gpt)'{-c,--chat-gpt}'[chat GPT model 3.5/4 shorthand or full qualified model name, can also be set via env variable OPENAI_API_MODEL]:chat GPT model:(3.5 4 4o mini o1 o1mini)'
+    '(-c --chat-gpt)'{-c,--chat-gpt}'[chat GPT model 3.5/4 shorthand or full qualified model name, can also be set via env variable OPENAI_API_MODEL]:chat GPT model:(3.5 4)'
    '(-i --interactive)'{-i,--interactive}'[start an interactive chat session. This will implicitly continue the conversation]'
    '(-s --stream)'{-s,--stream}'[Stream the incoming text to the terminal]'
    '(-t --tokens)'{-t,--tokens}'[display what *would* be sent, how many tokens, and estimated costs]'
--- a/src/_virtualbox
+++ b/src/_virtualbox
@ -345,10 +345,10 @@ _vboxmanage() {
            ':machine:_vboxmachines'
          ;;
        (controlvm)
-          local -a subcommands=(${(@f)"$(vboxmanage $words[1] | perl -wln -e 'm{VBoxManage controlvm.*?\s+([a-z][a-z-]+)(?:\s|$)} and print $1')"})
+          local -a subcommands=(${(@f)"$(vboxmanage $words[1] | perl -wln -e 'm{^\s+([a-z][a-z-]+)} and print $1')"})
          _arguments \
-            '1:machine:_vboxmachines' \
-            '2:commands:'"($subcommands)"
+            '1:commands:'"($subcommands)" \
+            ':machine:_vboxmachines'
          ;;
      esac
      ;;