[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 4fce53700073a9d65ebd20ac5756068fae32bc38

[Guillaume Rousse]

The following commit has been merged in the master branch:
commit 41746f0bcc1eda5b17a27ad5fd8b058e094999ea
Author: Guillaume Rousse <guillomovitch at zarb.org>
Date:   Sat May 2 17:20:41 2009 +0200

    fix indentation

diff --git a/contrib/ssh b/contrib/ssh
index 5296ad6..c6cedae 100644
--- a/contrib/ssh
+++ b/contrib/ssh
@@ -15,57 +15,66 @@ _ssh()
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
-	-@(F|i|S))
-		_filedir
-		return 0
-		;;
-	-c)
-	    COMPREPLY=( $( compgen -W '3des-cbc aes128-cbc aes192-cbc \
-		aes256-cbc aes128-ctr aes192-ctr aes256-ctr arcfour128 \
-		arcfour256 arcfour blowfish-cbc cast128-cbc' -- $cur ) )
-	    return 0
-	    ;;
-	-c)
-	    COMPREPLY=( $( compgen -W 'hmac-md5 hmac-sha1 umac-64 at openssh.com \
-		hmac-ripemd160 hmac-sha1-96 hmac-md5-96' -- $cur ) )
-	    return 0
-	    ;;
-	-l)
-	    COMPREPLY=( $( compgen -u -- $cur ) )
-	    return 0
-	    ;;
-	-o)
-	    COMPREPLY=( $( compgen -W 'AddressFamily BatchMode BindAddress \
-		ChallengeResponseAuthentication CheckHostIP Cipher Ciphers \
-		ClearAllForwardings Compression CompressionLevel \
-		ConnectionAttempts ConnectTimeout ControlMaster ControlPath \
-		DynamicForward EscapeChar ExitOnForwardFailure ForwardAgent \
-		ForwardX11 ForwardX11Trusted GatewayPorts GlobalKnownHostsFile \
-		GSSAPIAuthentication GSSAPIDelegateCredentials HashKnownHosts \
-		Host HostbasedAuthentication HostKeyAlgorithms HostKeyAlias \
-		HostName IdentityFile IdentitiesOnly KbdInteractiveDevices \
-		LocalCommand LocalForward LogLevel MACs \
-		NoHostAuthenticationForLocalhost NumberOfPasswordPrompts \
-		PasswordAuthentication PermitLocalCommand Port \
-		PreferredAuthentications Protocol ProxyCommand \
-		PubkeyAuthentication RekeyLimit RemoteForward \
-		RhostsRSAAuthentication RSAAuthentication SendEnv \
-		ServerAliveInterval ServerAliveCountMax SmartcardDevice \
-		StrictHostKeyChecking TCPKeepAlive Tunnel TunnelDevice \
-		UsePrivilegedPort User UserKnownHostsFile VerifyHostKeyDNS \
-		VisualHostKey XAuthLocation' -- $cur ) )
-	    return 0
-	    ;;
-	-w)
-		_available_interfaces
-		return 0
-		;;
-	-b)
-		COMPREPLY=( $( compgen -W "$(/sbin/ifconfig | \
-			awk '/adr:/ {print $2}' | \
-			awk -F: '{print $2}' )" -- $cur ) )
-		return 0
-		;;
+		-@(F|i|S))
+			_filedir
+			return 0
+			;;
+		-c)
+			COMPREPLY=( $( compgen -W '3des-cbc aes128-cbc \
+				aes192-cbc aes256-cbc aes128-ctr aes192-ctr \
+				aes256-ctr arcfour128 arcfour256 arcfour \
+				blowfish-cbc cast128-cbc' -- $cur ) )
+			return 0
+			;;
+		-c)
+			COMPREPLY=( $( compgen -W 'hmac-md5 hmac-sha1 \
+				umac-64 at openssh.com hmac-ripemd160 \
+				hmac-sha1-96 hmac-md5-96' -- $cur ) )
+			return 0
+			;;
+		-l)
+			COMPREPLY=( $( compgen -u -- $cur ) )
+			return 0
+			;;
+		-o)
+			COMPREPLY=( $( compgen -W 'AddressFamily BatchMode \
+				BindAddress ChallengeResponseAuthentication \
+				CheckHostIP Cipher Ciphers ClearAllForwardings \
+				Compression CompressionLevel \
+				ConnectionAttempts ConnectTimeout \
+				ControlMaster ControlPath DynamicForward \
+				EscapeChar ExitOnForwardFailure ForwardAgent \
+				ForwardX11 ForwardX11Trusted GatewayPorts \
+				GlobalKnownHostsFile GSSAPIAuthentication \
+				GSSAPIDelegateCredentials HashKnownHosts Host \
+				HostbasedAuthentication HostKeyAlgorithms \
+				HostKeyAlias HostName IdentityFile \
+				IdentitiesOnly KbdInteractiveDevices \
+				LocalCommand LocalForward LogLevel MACs \
+				NoHostAuthenticationForLocalhost \
+				NumberOfPasswordPrompts PasswordAuthentication \
+				PermitLocalCommand Port \
+				PreferredAuthentications Protocol \
+				ProxyCommand PubkeyAuthentication RekeyLimit \
+				RemoteForward RhostsRSAAuthentication \
+				RSAAuthentication SendEnv ServerAliveInterval \
+				ServerAliveCountMax SmartcardDevice \
+				StrictHostKeyChecking TCPKeepAlive Tunnel \
+				TunnelDevice UsePrivilegedPort User \
+				UserKnownHostsFile VerifyHostKeyDNS \
+				VisualHostKey XAuthLocation' -- $cur ) )
+			return 0
+			;;
+		-w)
+			_available_interfaces
+			return 0
+			;;
+		-b)
+			COMPREPLY=( $( compgen -W "$(/sbin/ifconfig | \
+				awk '/adr:/ {print $2}' | \
+				awk -F: '{print $2}' )" -- $cur ) )
+			return 0
+			;;
 	esac
 
 	if [[ "$cur" == -* ]]; then
@@ -170,14 +179,14 @@ _ssh_copy_id() {
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
-	-*i)
-	    _filedir
-	    ;;
+		-*i)
+		_filedir
+		;;
 	*)
-	    _known_hosts -a
+		_known_hosts -a
 
-	    [ $COMP_CWORD -eq 1 ] || \
-		COMPREPLY=( "${COMPREPLY[@]}" $( compgen -- $cur ) )
+		[ $COMP_CWORD -eq 1 ] || \
+			COMPREPLY=( "${COMPREPLY[@]}" $( compgen -- $cur ) )
 	esac
 
 	return 0

-- 
bash-completion