profile.d: Don't return from a sourced script (Debian: #741657)
This commit is contained in:
parent
293bbaaa90
commit
867282a734
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user