Drop no longer needed "type compopt" checks.

This commit is contained in:
Ville Skyttä 2011-04-21 12:35:24 +03:00
parent 9f45e81e65
commit aa411dd30b
3 changed files with 7 additions and 7 deletions

View File

@ -233,7 +233,7 @@ _java()
fi fi
[[ ${#COMPREPLY[@]} -eq 1 && ${COMPREPLY[0]} == -*[:=] ]] && \ [[ ${#COMPREPLY[@]} -eq 1 && ${COMPREPLY[0]} == -*[:=] ]] && \
type compopt &>/dev/null && compopt -o nospace compopt -o nospace
__ltrim_colon_completions "$cur" __ltrim_colon_completions "$cur"
} && } &&
@ -381,7 +381,7 @@ _pack200()
--verbose --quiet --log-file= --help --version -J \ --verbose --quiet --log-file= --help --version -J \
--repack' -- "$cur" ) ) --repack' -- "$cur" ) )
[[ ${#COMPREPLY[@]} -eq 1 && ${COMPREPLY[0]} == *= ]] && \ [[ ${#COMPREPLY[@]} -eq 1 && ${COMPREPLY[0]} == *= ]] && \
type compopt &>/dev/null && compopt -o nospace compopt -o nospace
else else
_filedir 'pack?(.gz)' _filedir 'pack?(.gz)'
fi fi
@ -426,7 +426,7 @@ _unpack200()
COMPREPLY=( $( compgen -W '--deflate-hint= --remove-pack-file \ COMPREPLY=( $( compgen -W '--deflate-hint= --remove-pack-file \
--verbose --quiet --log-file= --help --version' -- "$cur" ) ) --verbose --quiet --log-file= --help --version' -- "$cur" ) )
[[ ${#COMPREPLY[@]} -eq 1 && ${COMPREPLY[0]} == *= ]] && \ [[ ${#COMPREPLY[@]} -eq 1 && ${COMPREPLY[0]} == *= ]] && \
type compopt &>/dev/null && compopt -o nospace compopt -o nospace
else else
_filedir 'pack?(.gz)' _filedir 'pack?(.gz)'
fi fi

View File

@ -34,7 +34,7 @@ _smartctl_device()
-- "$cur" ) ) -- "$cur" ) )
case "${COMPREPLY[@]}" in case "${COMPREPLY[@]}" in
areca|3ware|hpt|megaraid|cciss) areca|3ware|hpt|megaraid|cciss)
type compopt &>/dev/null && compopt -o nospace compopt -o nospace
;; ;;
esac esac
;; ;;
@ -90,7 +90,7 @@ _smartctl_test()
select,redo select,next afterselect,on afterselect,off pending, select,redo select,next afterselect,on afterselect,off pending,
scttempint, vendor,' -- "$cur" ) ) scttempint, vendor,' -- "$cur" ) )
[[ ${#COMPREPLY[@]} -eq 1 && "${COMPREPLY[@]}" == *, ]] && \ [[ ${#COMPREPLY[@]} -eq 1 && "${COMPREPLY[@]}" == *, ]] && \
type compopt &>/dev/null && compopt -o nospace compopt -o nospace
} }
_smartctl_drivedb() _smartctl_drivedb()
{ {

View File

@ -27,7 +27,7 @@ _ssh_macs()
_ssh_options() _ssh_options()
{ {
type compopt &>/dev/null && compopt -o nospace compopt -o nospace
COMPREPLY=( $( compgen -S = -W 'AddressFamily BatchMode BindAddress \ COMPREPLY=( $( compgen -S = -W 'AddressFamily BatchMode BindAddress \
ChallengeResponseAuthentication CheckHostIP Cipher Ciphers \ ChallengeResponseAuthentication CheckHostIP Cipher Ciphers \
ClearAllForwardings Compression CompressionLevel ConnectionAttempts \ ClearAllForwardings Compression CompressionLevel ConnectionAttempts \
@ -327,7 +327,7 @@ _scp()
;; ;;
-F|-i|-S) -F|-i|-S)
_filedir _filedir
type compopt &>/dev/null && compopt +o nospace compopt +o nospace
return 0 return 0
;; ;;
-c) -c)