Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

abbr: coalesce multiple arguments to --add

Browse source 
Makes the behaviour of the script match the documentation.
This commit is contained in:
David Adam 2015-03-13 16:32:05 +08:00
parent bff68f3bfc
commit 48d353610f
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
share/functions/abbr.fish
View file

@ -10,9 +10,13 @@ function abbr --description "Manage abbreviations"
set -l mode_arg set -l mode_arg
set -l needs_arg no set -l needs_arg no
while set -q argv[1] while set -q argv[1]
if test $needs_arg = yes if test $needs_arg = single
set mode_arg $argv[1] set mode_arg $argv[1]
set needs_arg no set needs_arg no
else if test $needs_arg = coalesce
set mode_arg "$argv"
set needs_arg no
set -e argv
else else
set -l new_mode set -l new_mode
switch $argv[1] switch $argv[1]
@ -21,10 +25,10 @@ function abbr --description "Manage abbreviations"
return 0 return 0
case '-a' '--add' case '-a' '--add'
set new_mode add set new_mode add
set needs_arg yes set needs_arg coalesce
case '-r' '--remove' case '-r' '--remove'
set new_mode remove set new_mode remove
set needs_arg yes set needs_arg single
case '-l' '--list' case '-l' '--list'
set new_mode list set new_mode list
case '-s' '--show' case '-s' '--show'
@ -48,7 +52,7 @@ function abbr --description "Manage abbreviations"
end end
set -e argv[1] set -e argv[1]
end end
if test $needs_arg = yes if test $needs_arg != no
printf ( _ "%s: option requires an argument -- %s\n" ) abbr $mode_flag >&2 printf ( _ "%s: option requires an argument -- %s\n" ) abbr $mode_flag >&2
return 1 return 1
end end