summaryrefslogtreecommitdiff
path: root/extras/django_bash_completion
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2015-08-04 17:07:06 +0300
committerTim Graham <timograham@gmail.com>2015-08-04 14:27:31 -0400
commit74be214e8185c188ef6c1abf3e6dd0adadf5b794 (patch)
tree6b53c454ddb350b1900f7e2db28192a1e240e150 /extras/django_bash_completion
parent6d7a9d96fe57597719bc40491e3d428f01757ef3 (diff)
Fixed #25221 -- Prevented django_bash_completion from leaking variables into the environment.
Diffstat (limited to 'extras/django_bash_completion')
-rwxr-xr-xextras/django_bash_completion6
1 files changed, 4 insertions, 2 deletions
diff --git a/extras/django_bash_completion b/extras/django_bash_completion
index 3e02d8ef3a..1fac9ea2aa 100755
--- a/extras/django_bash_completion
+++ b/extras/django_bash_completion
@@ -42,10 +42,10 @@ complete -F _django_completion -o default django-admin.py manage.py django-admin
_python_django_completion()
{
if [[ ${COMP_CWORD} -ge 2 ]]; then
- PYTHON_EXE=${COMP_WORDS[0]##*/}
+ local PYTHON_EXE=${COMP_WORDS[0]##*/}
echo $PYTHON_EXE | egrep "python([2-9]\.[0-9])?" >/dev/null 2>&1
if [[ $? == 0 ]]; then
- PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
+ local PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
echo $PYTHON_SCRIPT | egrep "manage\.py|django-admin(\.py)?" >/dev/null 2>&1
if [[ $? == 0 ]]; then
COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]:1}" \
@@ -63,9 +63,11 @@ if command -v whereis &>/dev/null; then
for python in $python_interpreters; do
pythons="${pythons} ${python##*/}"
done
+ unset python_interpreters
pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
else
pythons=python
fi
complete -F _python_django_completion -o default $pythons
+unset pythons