Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make the alias built-in function work better

Browse source 
The new --wraps functionality was breaking aliases of the form
`alias foo='bar baz'`. That is, aliases where the body is multiple
words. Extract the first word of the body and use that instead.

Use better errors for aliases with no name or no body.
This commit is contained in:
Kevin Ballard 2014-08-20 18:19:23 -07:00 committed by ridiculousfish
parent 2da435712a
commit 61ce9db4ba
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
share/functions/alias.fish
View file

@ -12,6 +12,7 @@ function alias --description "Legacy function for creating shellscript functions
set -l name set -l name
set -l body set -l body
set -l prefix set -l prefix
set -l first_word
switch (count $argv) switch (count $argv)
case 0 case 0
@ -21,8 +22,9 @@ function alias --description "Legacy function for creating shellscript functions
# Some seds (e.g. on Mac OS X), don't support \n in the RHS # Some seds (e.g. on Mac OS X), don't support \n in the RHS
# Use a literal newline instead # Use a literal newline instead
# http://sed.sourceforge.net/sedfaq4.html#s4.1 # http://sed.sourceforge.net/sedfaq4.html#s4.1
set -l tmp (echo $argv|sed -e "s/\([^=]\)=/\1\\ # The extra '' at the end is so $tmp[2] is guaranteed to work
/") set -l tmp (echo $argv|sed -e 's/\([^=]\{0,1\}\)=/\1\
/') ''
set name $tmp[1] set name $tmp[1]
set body $tmp[2] set body $tmp[2]
@ -35,18 +37,34 @@ function alias --description "Legacy function for creating shellscript functions
return 1 return 1
end end
# sanity check
if test -z "$name"
printf ( _ "%s: Name cannot be empty\n") alias
return 1
else if test -z "$body"
printf ( _ "%s: Body cannot be empty\n") alias
return 1
end
# Extract the first command from the body
switch $body
case \*\ \* \*\t\*
# note: strip leading spaces if present
set first_word (echo $body|sed -e 's/^[[:space:]]\{1,\}//;s/[[:space:]].*//;q')
case '*'
set first_word $body
end
# Prevent the alias from immediately running into an infinite recursion if # Prevent the alias from immediately running into an infinite recursion if
# $body starts with the same command as $name. # $body starts with the same command as $name.
switch $body if test $first_word = $name
case $name $name\ \* $name\t\* if contains $name (builtin --names)
if contains $name (builtin --names) set prefix builtin
set prefix builtin else
else set prefix command
set prefix command end
end
end end
eval "function $name --wraps $body; $prefix $body \$argv; end" eval "function $name --wraps $first_word; $prefix $body \$argv; end"
end end