ssh, scp, sftp, ssh-copy-id, curl: improve identity file completion

Default to ~/.ssh/id*, exclude *.pub if looking for private.

Author: scop

completions/curl

@@ -76,7 +76,7 @@ _curl()
             return
             ;;
         --pubkey)
-            _filedir pub
+            _xfunc ssh _ssh_identityfile pub
             return
             ;;
         --stderr)

completions/ssh

@@ -108,6 +108,9 @@ _ssh_suboption()
         canonicalizehostname)
             COMPREPLY=( $(compgen -W 'yes no always' -- "$cur") )
             ;;
+        identityfile)
+            _ssh_identityfile
+            ;;
         *file|identityagent|include|controlpath|revokedhostkeys|xauthlocation)
             _filedir
             ;;
@@ -220,6 +223,17 @@ _ssh_configfile()
     done
 }
 
+# With $1 set, look for public key files, else private
+_ssh_identityfile()
+{
+    [[ -z $cur && -d ~/.ssh ]] && cur=~/.ssh/id
+    _filedir
+    if (( ${#COMPREPLY[@]} > 0 )); then
+        COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' \
+                              -X "${1:+!}*.pub" -- "$cur") )
+    fi
+}
+
 _ssh()
 {
     local cur prev words cword
@@ -252,10 +266,14 @@ _ssh()
         -*[DeLpRW])
             return
             ;;
-        -*[EFiS])
+        -*[EFS])
             _filedir
             return
             ;;
+        -*i)
+            _ssh_identityfile
+            return
+            ;;
         -*I)
             _filedir so
             return
@@ -335,10 +353,14 @@ _sftp()
         -*[BDlPRs])
             return
             ;;
-        -*[bFi])
+        -*[bF])
             _filedir
             return
             ;;
+        -*i)
+            _ssh_identityfile
+            return
+            ;;
         -*c)
             _ssh_ciphers
             return
@@ -464,11 +486,16 @@ _scp()
             COMPREPLY=( "${COMPREPLY[@]/%/ }" )
             return
             ;;
-        -*[Fi])
+        -*F)
             _filedir
             compopt +o nospace
             return
             ;;
+        -*i)
+            _ssh_identityfile
+            compopt +o nospace
+            return
+            ;;
         -*J)
             _known_hosts_real -a -F "$configfile" -- "$cur"
             return

completions/ssh-copy-id

@@ -9,7 +9,7 @@ _ssh_copy_id()
 
     case $prev in
         -i)
-            _filedir pub
+            _xfunc ssh _ssh_identityfile pub
             return
             ;;
         -p)