Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-25 20:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix ssh config Include file handling

Browse source 
Fixes #4253
This commit is contained in:
Kurtis Rader 2017-07-26 20:41:00 -07:00
parent a071deaf61
commit defdc92b57
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
share/functions/__fish_print_hostnames.fish
View file

@ -44,14 +44,14 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
function _ssh_include --argument-names ssh_config function _ssh_include --argument-names ssh_config
# Relative paths in Include directive use /etc/ssh or ~/.ssh depending on # Relative paths in Include directive use /etc/ssh or ~/.ssh depending on
# system or user level config. -F will not override this behaviour # system or user level config. -F will not override this behaviour
if test $ssh_config = '/etc/ssh/ssh_config' set -l relative_path $HOME/.ssh
if string match '/etc/ssh/*' -- $ssh_config
set relative_path '/etc/ssh' set relative_path '/etc/ssh'
else
set relative_path $HOME/.ssh
end end
function _recursive --no-scope-shadowing function _recursive --no-scope-shadowing
set paths set -l orig_dir $PWD
set -l paths
for config in $argv for config in $argv
set paths $paths (cat $config ^/dev/null \ set paths $paths (cat $config ^/dev/null \
# Keep only Include lines # Keep only Include lines
@ -62,10 +62,11 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
| string trim | string replace -r -a '\s+' ' ') | string trim | string replace -r -a '\s+' ' ')
end end
cd $relative_path
set -l new_paths set -l new_paths
for path in $paths for path in $paths
set -l expanded_path set -l expanded_path
eval set expanded_path (echo $path) eval "set expanded_path (printf \"%s\n\" $path)"
for path in $expanded_path for path in $expanded_path
# Resolve "relative" paths in accordance to ssh path resolution # Resolve "relative" paths in accordance to ssh path resolution
if string match -qv '/*' $path if string match -qv '/*' $path
@ -75,9 +76,9 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
set new_paths $new_paths $path set new_paths $new_paths $path
end end
end end
cd $orig_dir
if test -n "$new_paths" if test -n "$new_paths"
_recursive $new_paths _recursive $new_paths
end end
end end