[Bash-completion-commits] [bash-completion] 03/04: scp, sftp: Fix querying ssh options

[Ville Skyttä]

This is an automated email from the git hooks/post-receive script.

scop-guest pushed a commit to branch master
in repository bash-completion.

commit 50ea015f8bc66919eb0ecc7ed351c1f89755f8c0
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Sep 5 10:16:58 2015 +0300

    scp, sftp: Fix querying ssh options
---
 completions/ssh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/completions/ssh b/completions/ssh
index 7bca4e0..4cddfb5 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -13,7 +13,7 @@ _ssh_query()
 
 _ssh_ciphers()
 {
-    local ciphers="$( _ssh_query $1 cipher )"
+    local ciphers='$( _ssh_query "$1" cipher )'
     [[ $ciphers ]] || ciphers="3des-cbc aes128-cbc aes192-cbc aes256-cbc
         aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
         blowfish-cbc cast128-cbc"
@@ -22,7 +22,7 @@ _ssh_ciphers()
 
 _ssh_macs()
 {
-    local macs="$( _ssh_query $1 mac )"
+    local macs='$( _ssh_query "$1" mac )'
     [[ $macs ]] || macs="hmac-md5 hmac-sha1 umac-64 at openssh.com hmac-ripemd160
         hmac-sha1-96 hmac-md5-96"
     COMPREPLY+=( $( compgen -W "$macs" -- "$cur" ) )
@@ -91,10 +91,10 @@ _ssh_suboption()
                 cs{0..7} ef lowdelay throughput reliability' -- "$cur" ) )
             ;;
         HostbasedKeyTypes|HostKeyAlgorithms)
-            COMPREPLY=( $( compgen -W '$( _ssh_query $2 key )' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '$( _ssh_query "$2" key )' -- "$cur" ) )
             ;;
         KexAlgorithms)
-            COMPREPLY=( $( compgen -W '$( _ssh_query $2 kex )' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '$( _ssh_query "$2" kex )' -- "$cur" ) )
             ;;
         Protocol)
             COMPREPLY=( $( compgen -W '1 2 1,2 2,1' -- "$cur" ) )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/bash-completion.git