diff options
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/get_ci_vm.sh | 6 | ||||
| -rwxr-xr-x | hack/xref-helpmsgs-manpages | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh index f8c7e792e..0755470a2 100755 --- a/hack/get_ci_vm.sh +++ b/hack/get_ci_vm.sh @@ -7,7 +7,7 @@ # problems specifically related to Cirrus-CI automated testing. However, # because it's only loosely coupled to the `.cirrus.yml` configuration, it must # orchestrate VMs in GCP directly. This means users need to have -# pre-authorization (access) to manipulate google-cloud resoures. Additionally, +# pre-authorization (access) to manipulate google-cloud resources. Additionally, # there are no guarantees it will remain in-sync with other automation-related # scripts. Therefore it may not always function for everybody in every # future scenario without updates/modifications/tweaks. @@ -149,7 +149,7 @@ parse_args(){ VM_IMAGE_NAME="$1" - # Word-splitting is desireable in this case + # Word-splitting is desirable in this case # shellcheck disable=SC2207 ENVS=( $(get_env_vars) @@ -166,7 +166,7 @@ parse_args(){ } # Returns true if user has run an 'init' and has a valid token for -# the specific project-id and named-configuration argumens in $PGCLOUD. +# the specific project-id and named-configuration arguments in $PGCLOUD. function has_valid_credentials() { if $PGCLOUD info |& grep -Eq 'Account:.*None'; then return 1 diff --git a/hack/xref-helpmsgs-manpages b/hack/xref-helpmsgs-manpages index 0c4d9d6e7..55c8b6582 100755 --- a/hack/xref-helpmsgs-manpages +++ b/hack/xref-helpmsgs-manpages @@ -334,8 +334,15 @@ sub podman_man { @most_recent_flags = (); # As of PR #8292, all options are <h4> and anchored if ($line =~ s/^\#{4}\s+//) { - # Handle any variation of '**--foo**, **-f**' - while ($line =~ s/^\*\*((--[a-z0-9-]+)|(-.))\*\*(,\s+)?//g) { + # If option has long and short form, long must come first. + # This is a while-loop because there may be multiple long + # option names, e.g. --net/--network + while ($line =~ s/^\*\*(--[a-z0-9-]+)\*\*(=\*[a-zA-Z0-9-]+\*)?(,\s+)?//g) { + $man{$1} = 1; + push @most_recent_flags, $1; + } + # Short form + if ($line =~ s/^\*\*(-[a-zA-Z0-9])\*\*(=\*[a-zA-Z0-9-]+\*)?//g) { $man{$1} = 1; # Keep track of them, in case we see 'Not implemented' below |