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

alias: Fix string args being parsed as options

Browse source
This commit is contained in:
George Christou 2018-02-28 07:41:12 +00:00 committed by Fabian Homborg
parent 973533e374
commit 6f1ae79a13
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
share/functions/alias.fish
View file

@ -19,7 +19,7 @@ function alias --description 'Creates a function wrapping a command'
for func in (functions -n) for func in (functions -n)
set -l output (functions $func | string match -r -- "^function .* --description 'alias (.*)'") set -l output (functions $func | string match -r -- "^function .* --description 'alias (.*)'")
if set -q output[2] if set -q output[2]
set output (string replace -r '^'$func'[= ]' '' -- $output[2]) set output (string replace -r -- '^'$func'[= ]' '' $output[2])
echo alias $func (string escape -- $output[1]) echo alias $func (string escape -- $output[1])
end end
end end
@ -47,10 +47,10 @@ function alias --description 'Creates a function wrapping a command'
# Extract the first command from the body. This is supposed to replace all non-escaped (i.e. # Extract the first command from the body. This is supposed to replace all non-escaped (i.e.
# preceded by an odd number of `\`) spaces with a newline so it splits on them. See issue #2220 # preceded by an odd number of `\`) spaces with a newline so it splits on them. See issue #2220
# for why the following borderline incomprehensible code exists. # for why the following borderline incomprehensible code exists.
set -l tmp (string replace -ra "([^\\\ ])((\\\\\\\)*) " '$1\n' $body) set -l tmp (string replace -ra -- "([^\\\ ])((\\\\\\\)*) " '$1\n' $body)
set first_word (string trim $tmp[1]) set first_word (string trim -- $tmp[1])
# If the user does something like `alias x 'foo; bar'` we need to strip the semicolon. # If the user does something like `alias x 'foo; bar'` we need to strip the semicolon.
set base_command (string trim -c ';' $first_word) set base_command (string trim -c ';' -- $first_word)
if set -q tmp[2] if set -q tmp[2]
set body $tmp[2..-1] set body $tmp[2..-1]
else else
@ -66,8 +66,8 @@ function alias --description 'Creates a function wrapping a command'
set prefix command set prefix command
end end
end end
set -l cmd_string (string escape "alias $argv") set -l cmd_string (string escape -- "alias $argv")
set wrapped_cmd (string join ' ' $first_word $body | string escape) set wrapped_cmd (string join ' ' -- $first_word $body | string escape)
echo "function $name --wraps $wrapped_cmd --description $cmd_string; $prefix $first_word $body \$argv; end" | source echo "function $name --wraps $wrapped_cmd --description $cmd_string; $prefix $first_word $body \$argv; end" | source
#echo "function $name --wraps $wrapped_cmd --description $cmd_string; $prefix $first_word $body \$argv; end" #echo "function $name --wraps $wrapped_cmd --description $cmd_string; $prefix $first_word $body \$argv; end"
end end