From 60c02689879aebdeba71205a88e7da40f847852f Mon Sep 17 00:00:00 2001 From: James Roberts-Thomson Date: Tue, 16 Apr 2013 15:53:39 +1200 Subject: [PATCH] Consolidate bash version checks There were two checks for bash version, the 2nd was superfluous; this patch removes the duplicate checks, and shifts the bash version check to being back after the "are we in bash" check. Change-Id: I57ff8c1fedce80f739c06643d2976d2c1465db1b --- envsetup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 6a532eff5..b75985dd1 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -348,18 +348,18 @@ function settitle() function addcompletions() { - local T dir f - # Keep us from trying to run in something that isn't bash. if [ -z "${BASH_VERSION}" ]; then return fi # Keep us from trying to run in bash that's too old. - if [ ${BASH_VERSINFO[0]} -lt 3 ]; then + if [ "${BASH_VERSINFO[0]}" -lt 4 ] ; then return fi + local T dir f + dirs="sdk/bash_completion vendor/cm/bash_completion" for dir in $dirs; do if [ -d ${dir} ]; then -- 2.11.0