[Bash-completion-commits] [bash-completion] 01/01: profile.d: Don't return from a sourced script (Debian: #741657)

[Ville Skyttä]

This is an automated email from the git hooks/post-receive script.

scop-guest pushed a commit to branch master
in repository bash-completion.

commit 867282a7341ccfff9a0e8a8ef6bba6e781b66afb
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Mar 16 13:29:42 2014 +0200

    profile.d: Don't return from a sourced script (Debian: #741657)
---
 bash_completion.sh.in | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/bash_completion.sh.in b/bash_completion.sh.in
index 2fb7462..fb22dad 100644
--- a/bash_completion.sh.in
+++ b/bash_completion.sh.in
@@ -1,14 +1,16 @@
 # Check for interactive bash and that we haven't already been sourced.
-[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION_COMPAT_DIR" ] && return
+if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
 
-# Check for recent enough version of bash.
-bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-if [ $bmajor -gt 4 ] || [ $bmajor -eq 4 -a $bminor -ge 1 ]; then
-    [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
-        . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
-    if shopt -q progcomp && [ -r @pkgdatadir@/bash_completion ]; then
-        # Source completion code.
-        . @pkgdatadir@/bash_completion
+    # Check for recent enough version of bash.
+    bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
+    if [ $bmajor -gt 4 ] || [ $bmajor -eq 4 -a $bminor -ge 1 ]; then
+        [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
+            . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
+        if shopt -q progcomp && [ -r @pkgdatadir@/bash_completion ]; then
+            # Source completion code.
+            . @pkgdatadir@/bash_completion
+        fi
     fi
+    unset bash bmajor bminor
+
 fi
-unset bash bmajor bminor

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/bash-completion.git