From aad8342aa43cb9fba8d4989f844df41333719738 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Mon, 25 Feb 2008 19:38:09 +0000 Subject: [PATCH] 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 --- extras/django_bash_completion | 10 +++++----- 1 file 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