summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2008-02-25 19:38:09 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2008-02-25 19:38:09 +0000
commitaad8342aa43cb9fba8d4989f844df41333719738 (patch)
treea782fde08d2fa5c47185e9dcba03c1f33fdd3edf
parent5ca0b9203b6f852b65f454e1b20bf3d478561b64 (diff)
downloaddjango-aad8342aa43cb9fba8d4989f844df41333719738.tar.gz
Fixed #6661: fixed a bug with bash completion and python -i. Thanks, Soeren Sonnenburg.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--extras/django_bash_completion10
1 files changed, 5 insertions, 5 deletions
diff --git a/extras/django_bash_completion b/extras/django_bash_completion
index 8906609a68..7b2b1947d8 100644
--- a/extras/django_bash_completion
+++ b/extras/django_bash_completion
@@ -61,13 +61,13 @@ _django_completion()
||
# python manage.py, /some/path/python manage.py (if manage.py exists)
( ${COMP_CWORD} -eq 2 &&
- ( $( basename ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
- ( $( basename ${COMP_WORDS[1]} ) == manage.py) &&
+ ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
+ ( $( basename -- ${COMP_WORDS[1]} ) == manage.py) &&
( -r ${COMP_WORDS[1]} ) )
||
( ${COMP_CWORD} -eq 2 &&
- ( $( basename ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
- ( $( basename ${COMP_WORDS[1]} ) == django-admin.py) &&
+ ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
+ ( $( basename -- ${COMP_WORDS[1]} ) == django-admin.py) &&
( -r ${COMP_WORDS[1]} ) ) ]] ; then
case ${cur} in
@@ -149,7 +149,7 @@ unset pythons
if command -v whereis &>/dev/null; then
python_interpreters=$(whereis python | cut -d " " -f 2-)
for python in $python_interpreters; do
- pythons="${pythons} $(basename $python)"
+ pythons="${pythons} $(basename -- $python)"
done
pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
else