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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit f194a2d753c520877e0a97d4812ec2f7eeb95889
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Oct 22 11:50:20 2009 +0300

    bash < 3 support removal step 4: drop unneeded version checks.

diff --git a/bash_completion b/bash_completion
index 4725452..fe13b67 100644
--- a/bash_completion
+++ b/bash_completion
@@ -57,26 +57,18 @@ case ${UNAME} in
 esac
 
 # features supported by bash 2.05 and higher
-if [ ${BASH_VERSINFO[0]} -eq 2 ] && [[ ${BASH_VERSINFO[1]} > 04 ]] ||
-    [ ${BASH_VERSINFO[0]} -gt 2 ]; then
-    declare -r bash205=$BASH_VERSION 2>/dev/null || :
-    default="-o default"
-    dirnames="-o dirnames"
-    filenames="-o filenames"
-    compopt=:
-fi
+declare -r bash205=$BASH_VERSION 2>/dev/null || :
+default="-o default"
+dirnames="-o dirnames"
+filenames="-o filenames"
+compopt=:
 # features supported by bash 2.05b and higher
-if [ ${BASH_VERSINFO[0]} -eq 2 ] && [[ ${BASH_VERSINFO[1]} = "05b" ]] ||
-    [ ${BASH_VERSINFO[0]} -gt 2 ]; then
-    declare -r bash205b=$BASH_VERSION 2>/dev/null || :
-    nospace="-o nospace"
-fi
+declare -r bash205b=$BASH_VERSION 2>/dev/null || :
+nospace="-o nospace"
 # features supported by bash 3.0 and higher
-if [ ${BASH_VERSINFO[0]} -gt 2 ]; then
-    declare -r bash3=$BASH_VERSION 2>/dev/null || :
-    bashdefault="-o bashdefault"
-    plusdirs="-o plusdirs"
-fi
+declare -r bash3=$BASH_VERSION 2>/dev/null || :
+bashdefault="-o bashdefault"
+plusdirs="-o plusdirs"
 # features supported by bash 4.0 and higher
 if [ ${BASH_VERSINFO[0]} -gt 3 ]; then
     declare -r bash4=$BASH_VERSION 2>/dev/null || :

-- 
bash-completion