Skip to content

Commit 3bd01e5

Browse files
DannyBenDannyBen
authored
Merge pull request #528 from DannyBen/remove/redundant-usage-code
Remove redundant code in usage function
2 parents 9271e70 + f87986a commit 3bd01e5

File tree

16 files changed

+135
-109
lines changed

16 files changed

+135
-109
lines changed

‎examples/catch-all/src/root_command.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
echo "# this file is located in 'src/root_command.sh'"
2+
echo "# you can edit it freely and regenerate (it will not be overwritten)"
3+
inspect_args

‎examples/completions/README.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ _cli_completions_filter() {
208208

209209
if [[ "${cur:0:1}" == "-" ]]; then
210210
echo "$words"
211-
211+
212212
else
213213
for word in $words; do
214214
[[ "${word:0:1}" != "-" ]] && result+=("$word")
@@ -226,56 +226,56 @@ _cli_completions() {
226226

227227
case "$compline" in
228228
'download'*'--handler')
229-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "curl wget")" -- "$cur" )
229+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "curl wget")" -- "$cur")
230230
;;
231231

232232
'upload'*'--user')
233-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A user -- "$cur" )
233+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A user -- "$cur")
234234
;;
235235

236236
'completions'*)
237-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--help -h")" -- "$cur" )
237+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--help -h")" -- "$cur")
238238
;;
239239

240240
'd'*'--handler')
241-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "curl wget")" -- "$cur" )
241+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "curl wget")" -- "$cur")
242242
;;
243243

244244
'upload'*'-u')
245-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A user -- "$cur" )
245+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A user -- "$cur")
246246
;;
247247

248248
'download'*)
249-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A file -W "$(_cli_completions_filter "--force --handler --help -f -h")" -- "$cur" )
249+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A file -W "$(_cli_completions_filter "--force --handler --help -f -h")" -- "$cur")
250250
;;
251251

252252
'u'*'--user')
253-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A user -- "$cur" )
253+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A user -- "$cur")
254254
;;
255255

256256
'upload'*)
257-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A directory -A user -W "$(_cli_completions_filter "--help --password --user -h -p -u CHANGELOG.md README.md")" -- "$cur" )
257+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A directory -A user -W "$(_cli_completions_filter "--help --password --user -h -p -u CHANGELOG.md README.md")" -- "$cur")
258258
;;
259259

260260
'u'*'-u')
261-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A user -- "$cur" )
261+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A user -- "$cur")
262262
;;
263263

264264
'd'*)
265-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A file -W "$(_cli_completions_filter "--force --handler --help -f -h")" -- "$cur" )
265+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A file -W "$(_cli_completions_filter "--force --handler --help -f -h")" -- "$cur")
266266
;;
267267

268268
'u'*)
269-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A directory -A user -W "$(_cli_completions_filter "--help --password --user -h -p -u CHANGELOG.md README.md")" -- "$cur" )
269+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A directory -A user -W "$(_cli_completions_filter "--help --password --user -h -p -u CHANGELOG.md README.md")" -- "$cur")
270270
;;
271271

272272
*)
273-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--help --version -h -v completions d download u upload")" -- "$cur" )
273+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--help --version -h -v completions d download u upload")" -- "$cur")
274274
;;
275275

276276
esac
277277
} &&
278-
complete -F _cli_completions cli
278+
complete -F _cli_completions cli
279279

280280
# ex: filetype=sh
281281

‎examples/completions/src/lib/send_completions.sh‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ send_completions() {
1313
echo $''
1414
echo $' if [[ "${cur:0:1}" == "-" ]]; then'
1515
echo $' echo "$words"'
16-
echo $' '
16+
echo $''
1717
echo $' else'
1818
echo $' for word in $words; do'
1919
echo $' [[ "${word:0:1}" != "-" ]] && result+=("$word")'
@@ -31,56 +31,56 @@ send_completions() {
3131
echo $''
3232
echo $' case "$compline" in'
3333
echo $' \'download\'*\'--handler\')'
34-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "curl wget")" -- "$cur" )'
34+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "curl wget")" -- "$cur")'
3535
echo $' ;;'
3636
echo $''
3737
echo $' \'upload\'*\'--user\')'
38-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A user -- "$cur" )'
38+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A user -- "$cur")'
3939
echo $' ;;'
4040
echo $''
4141
echo $' \'completions\'*)'
42-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--help -h")" -- "$cur" )'
42+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--help -h")" -- "$cur")'
4343
echo $' ;;'
4444
echo $''
4545
echo $' \'d\'*\'--handler\')'
46-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "curl wget")" -- "$cur" )'
46+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "curl wget")" -- "$cur")'
4747
echo $' ;;'
4848
echo $''
4949
echo $' \'upload\'*\'-u\')'
50-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A user -- "$cur" )'
50+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A user -- "$cur")'
5151
echo $' ;;'
5252
echo $''
5353
echo $' \'download\'*)'
54-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A file -W "$(_cli_completions_filter "--force --handler --help -f -h")" -- "$cur" )'
54+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A file -W "$(_cli_completions_filter "--force --handler --help -f -h")" -- "$cur")'
5555
echo $' ;;'
5656
echo $''
5757
echo $' \'u\'*\'--user\')'
58-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A user -- "$cur" )'
58+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A user -- "$cur")'
5959
echo $' ;;'
6060
echo $''
6161
echo $' \'upload\'*)'
62-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A directory -A user -W "$(_cli_completions_filter "--help --password --user -h -p -u CHANGELOG.md README.md")" -- "$cur" )'
62+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A directory -A user -W "$(_cli_completions_filter "--help --password --user -h -p -u CHANGELOG.md README.md")" -- "$cur")'
6363
echo $' ;;'
6464
echo $''
6565
echo $' \'u\'*\'-u\')'
66-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A user -- "$cur" )'
66+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A user -- "$cur")'
6767
echo $' ;;'
6868
echo $''
6969
echo $' \'d\'*)'
70-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A file -W "$(_cli_completions_filter "--force --handler --help -f -h")" -- "$cur" )'
70+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A file -W "$(_cli_completions_filter "--force --handler --help -f -h")" -- "$cur")'
7171
echo $' ;;'
7272
echo $''
7373
echo $' \'u\'*)'
74-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A directory -A user -W "$(_cli_completions_filter "--help --password --user -h -p -u CHANGELOG.md README.md")" -- "$cur" )'
74+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A directory -A user -W "$(_cli_completions_filter "--help --password --user -h -p -u CHANGELOG.md README.md")" -- "$cur")'
7575
echo $' ;;'
7676
echo $''
7777
echo $' *)'
78-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--help --version -h -v completions d download u upload")" -- "$cur" )'
78+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--help --version -h -v completions d download u upload")" -- "$cur")'
7979
echo $' ;;'
8080
echo $''
8181
echo $' esac'
8282
echo $'} &&'
83-
echo $'complete -F _cli_completions cli'
83+
echo $' complete -F _cli_completions cli'
8484
echo $''
8585
echo $'# ex: filetype=sh'
8686
}

‎examples/render-mandoc/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ ISSUE TRACKER
102102
AUTHORS
103103
Lana Lang.
104104

105-
Version 0.1.0 April 2024 download(1)
105+
Version 0.1.0 July 2024 download(1)
106106

107107

108108
````

‎examples/render-mandoc/docs/download.1‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
.\" Automatically generated by Pandoc 3.1.9
1+
.\" Automatically generated by Pandoc 3.2
22
.\"
3-
.TH "download" "1" "April 2024" "Version 0.1.0" "Sample application"
3+
.TH "download" "1" "July 2024" "Version 0.1.0" "Sample application"
44
.SH NAME
5-
\f[B]download\f[R] - Sample application
5+
\f[B]download\f[R] \- Sample application
66
.SH SYNOPSIS
77
\f[B]download\f[R] SOURCE [TARGET...]
88
OPTIONS
@@ -20,15 +20,15 @@ Target filename (default: same as source)
2020
.IP \[bu] 2
2121
\f[I]Repeatable\f[R]
2222
.SH OPTIONS
23-
.SS --force, -f
23+
.SS \-\-force, \-f
2424
Overwrite existing files
25-
.SS --debug, -d
25+
.SS \-\-debug, \-d
2626
Show debug information
2727
.SH DEPENDENCIES
28-
.SS aws-cli
28+
.SS aws\-cli
2929
Download from <https://aws.amazon.com/cli/>
3030
.SH SEE ALSO
31-
\f[B]docker\f[R](1), \f[B]docker-compose.yml\f[R](5)
31+
\f[B]docker\f[R](1), \f[B]docker\-compose.yml\f[R](5)
3232
.SH ISSUE TRACKER
3333
Report issues at <https://github.com/lanalang/smallville>
3434
.SH AUTHORS

‎examples/render-mandoc/docs/download.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% download(1) Version 0.1.0 | Sample application
22
% Lana Lang
3-
% April 2024
3+
% July 2024
44

55
NAME
66
==================================================

‎lib/bashly/views/command/usage.gtx‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
= view_marker
22

33
> {{ function_name }}_usage() {
4-
> if [[ -n $long_usage ]]; then
5-
64
if summary == help
7-
> printf "{{ caption_string.sanitize_for_print }}\n"
8-
> echo
5+
> printf "{{ caption_string.sanitize_for_print }}\n\n"
96
else
10-
> printf "{{ full_name }}\n"
11-
> echo
12-
> printf "{{ help.wrap(78).indent(2).sanitize_for_print }}\n"
13-
> echo
7+
> if [[ -n $long_usage ]]; then
8+
> printf "{{ full_name }}\n\n"
9+
> printf "{{ help.wrap(78).indent(2).sanitize_for_print }}\n\n"
10+
> else
11+
> printf "{{ caption_string.sanitize_for_print }}\n\n"
12+
> fi
1413
end
1514

16-
> else
17-
> printf "{{ caption_string.sanitize_for_print }}\n"
18-
> echo
19-
> fi
20-
>
21-
2215
if alt&.any?
2316
> printf "{{ strings[:command_alias] % { alias: alt.join(', ') } }}\n"
2417
> echo
@@ -48,3 +41,5 @@ end
4841
commands.each do |command|
4942
= command.render 'usage'
5043
end
44+
45+

‎spec/approvals/cli/add/comp-function-file‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ send_completions() {
1313
echo $''
1414
echo $' if [[ "${cur:0:1}" == "-" ]]; then'
1515
echo $' echo "$words"'
16-
echo $' '
16+
echo $''
1717
echo $' else'
1818
echo $' for word in $words; do'
1919
echo $' [[ "${word:0:1}" != "-" ]] && result+=("$word")'
@@ -31,28 +31,28 @@ send_completions() {
3131
echo $''
3232
echo $' case "$compline" in'
3333
echo $' \'download\'*)'
34-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--force --help -f -h")" -- "$cur" )'
34+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--force --help -f -h")" -- "$cur")'
3535
echo $' ;;'
3636
echo $''
3737
echo $' \'upload\'*)'
38-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--help --password --user -h -p -u")" -- "$cur" )'
38+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--help --password --user -h -p -u")" -- "$cur")'
3939
echo $' ;;'
4040
echo $''
4141
echo $' \'d\'*)'
42-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--force --help -f -h")" -- "$cur" )'
42+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--force --help -f -h")" -- "$cur")'
4343
echo $' ;;'
4444
echo $''
4545
echo $' \'u\'*)'
46-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--help --password --user -h -p -u")" -- "$cur" )'
46+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--help --password --user -h -p -u")" -- "$cur")'
4747
echo $' ;;'
4848
echo $''
4949
echo $' *)'
50-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--help --version -h -v d download u upload")" -- "$cur" )'
50+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--help --version -h -v d download u upload")" -- "$cur")'
5151
echo $' ;;'
5252
echo $''
5353
echo $' esac'
5454
echo $'} &&'
55-
echo $'complete -F _cli_completions cli'
55+
echo $' complete -F _cli_completions cli'
5656
echo $''
5757
echo $'# ex: filetype=sh'
5858
}

‎spec/approvals/cli/add/comp-script-file‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ _cli_completions_filter() {
1111

1212
if [[ "${cur:0:1}" == "-" ]]; then
1313
echo "$words"
14-
14+
1515
else
1616
for word in $words; do
1717
[[ "${word:0:1}" != "-" ]] && result+=("$word")
@@ -29,27 +29,27 @@ _cli_completions() {
2929

3030
case "$compline" in
3131
'download'*)
32-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--force --help -f -h")" -- "$cur" )
32+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--force --help -f -h")" -- "$cur")
3333
;;
3434

3535
'upload'*)
36-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--help --password --user -h -p -u")" -- "$cur" )
36+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--help --password --user -h -p -u")" -- "$cur")
3737
;;
3838

3939
'd'*)
40-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--force --help -f -h")" -- "$cur" )
40+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--force --help -f -h")" -- "$cur")
4141
;;
4242

4343
'u'*)
44-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--help --password --user -h -p -u")" -- "$cur" )
44+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--help --password --user -h -p -u")" -- "$cur")
4545
;;
4646

4747
*)
48-
while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -W "$(_cli_completions_filter "--help --version -h -v d download u upload")" -- "$cur" )
48+
while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_cli_completions_filter "--help --version -h -v d download u upload")" -- "$cur")
4949
;;
5050

5151
esac
5252
} &&
53-
complete -F _cli_completions cli
53+
complete -F _cli_completions cli
5454

5555
# ex: filetype=sh

‎spec/approvals/completions/function‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ custom_name() {
1212
echo $''
1313
echo $' if [[ "${cur:0:1}" == "-" ]]; then'
1414
echo $' echo "$words"'
15-
echo $' '
15+
echo $''
1616
echo $' else'
1717
echo $' for word in $words; do'
1818
echo $' [[ "${word:0:1}" != "-" ]] && result+=("$word")'
@@ -30,12 +30,12 @@ custom_name() {
3030
echo $''
3131
echo $' case "$compline" in'
3232
echo $' *)'
33-
echo $' while read -r; do COMPREPLY+=( "$REPLY" ); done < <( compgen -A file -W "$(_get_completions_filter "--force --help --verbose --version -h -v")" -- "$cur" )'
33+
echo $' while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -A file -W "$(_get_completions_filter "--force --help --verbose --version -h -v")" -- "$cur")'
3434
echo $' ;;'
3535
echo $''
3636
echo $' esac'
3737
echo $'} &&'
38-
echo $'complete -F _get_completions get'
38+
echo $' complete -F _get_completions get'
3939
echo $''
4040
echo $'# ex: filetype=sh'
4141
}

0 commit comments

Comments
 (0)