[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-104-gaa411dd

[Ville Skyttä]

The following commit has been merged in the master branch:
commit aa411dd30b038e26bc3ac34701998362bc41d9a1
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Apr 21 12:35:24 2011 +0300

    Drop no longer needed "type compopt" checks.

diff --git a/completions/java b/completions/java
index 31dcd31..ee3e513 100644
--- a/completions/java
+++ b/completions/java
@@ -233,7 +233,7 @@ _java()
     fi
 
     [[ ${#COMPREPLY[@]} -eq 1 && ${COMPREPLY[0]} == -*[:=] ]] && \
-        type compopt &>/dev/null && compopt -o nospace
+        compopt -o nospace
 
     __ltrim_colon_completions "$cur"
 } &&
@@ -381,7 +381,7 @@ _pack200()
                 --verbose --quiet --log-file= --help --version -J \
                 --repack' -- "$cur" ) )
             [[ ${#COMPREPLY[@]} -eq 1 && ${COMPREPLY[0]} == *= ]] && \
-                type compopt &>/dev/null && compopt -o nospace
+                compopt -o nospace
         else
             _filedir 'pack?(.gz)'
         fi
@@ -426,7 +426,7 @@ _unpack200()
             COMPREPLY=( $( compgen -W '--deflate-hint= --remove-pack-file \
                 --verbose --quiet --log-file= --help --version' -- "$cur" ) )
             [[ ${#COMPREPLY[@]} -eq 1 && ${COMPREPLY[0]} == *= ]] && \
-                type compopt &>/dev/null && compopt -o nospace
+                compopt -o nospace
         else
             _filedir 'pack?(.gz)'
         fi
diff --git a/completions/smartctl b/completions/smartctl
index e7e7183..2b93a15 100644
--- a/completions/smartctl
+++ b/completions/smartctl
@@ -34,7 +34,7 @@ _smartctl_device()
                     -- "$cur" ) )
             case "${COMPREPLY[@]}" in
                 areca|3ware|hpt|megaraid|cciss)
-                    type compopt &>/dev/null && compopt -o nospace
+                    compopt -o nospace
                     ;;
             esac
             ;;
@@ -90,7 +90,7 @@ _smartctl_test()
         select,redo select,next afterselect,on afterselect,off pending,
         scttempint, vendor,' -- "$cur" ) )
     [[ ${#COMPREPLY[@]} -eq 1 && "${COMPREPLY[@]}" == *, ]] && \
-        type compopt &>/dev/null && compopt -o nospace
+        compopt -o nospace
 }
 _smartctl_drivedb()
 {
diff --git a/completions/ssh b/completions/ssh
index 775b5f5..4ded71d 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -27,7 +27,7 @@ _ssh_macs()
 
 _ssh_options()
 {
-    type compopt &>/dev/null && compopt -o nospace
+    compopt -o nospace
     COMPREPLY=( $( compgen -S = -W 'AddressFamily BatchMode BindAddress \
         ChallengeResponseAuthentication CheckHostIP Cipher Ciphers \
         ClearAllForwardings Compression CompressionLevel ConnectionAttempts \
@@ -327,7 +327,7 @@ _scp()
             ;;
         -F|-i|-S)
             _filedir
-            type compopt &>/dev/null && compopt +o nospace
+            compopt +o nospace
             return 0
             ;;
         -c)

-- 
bash-completion