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

type: Separate the notion of multi and paths

Browse source 
Track whether -a and -f have been supplied separately. That way both
`type -a -f command` and `type -f -a command` behaves correctly, as does
`type -a -f foo` where there are multiple executables named `foo` in the
$PATH.
This commit is contained in:
Kevin Ballard 2014-07-10 00:07:58 -07:00
parent bfd3a47380
commit 6b062b07b4
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
share/functions/type.fish
View file

@ -4,6 +4,7 @@ function type --description "Print the type of a command"
# Initialize # Initialize
set -l res 1 set -l res 1
set -l mode normal set -l mode normal
set -l multi no
set -l selection all set -l selection all
# Parse options # Parse options
@ -22,7 +23,7 @@ function type --description "Print the type of a command"
set selection files set selection files
case -a --all case -a --all
set selection multi set multi yes
case -f --no-functions case -f --no-functions
set selection files set selection files
@ -65,7 +66,7 @@ function type --description "Print the type of a command"
echo echo
end end
if test $selection != multi if test $multi != yes
continue continue
end end
end end
@ -84,7 +85,7 @@ function type --description "Print the type of a command"
case path case path
echo echo
end end
if test $selection != multi if test $multi != yes
continue continue
end end
end end
@ -92,7 +93,7 @@ function type --description "Print the type of a command"
end end
set -l paths set -l paths
if test $selection != multi if test $multi != yes
set paths (command -p $i) set paths (command -p $i)
else else
set paths (which -a $i ^/dev/null) set paths (which -a $i ^/dev/null)
@ -110,7 +111,7 @@ function type --description "Print the type of a command"
case path case path
echo $path echo $path
end end
if test $selection != multi if test $multi != yes
continue continue
end end
end end