Changeset 4646

Timestamp:

02/28/07 09:39:53 (2 years ago)

Author:

jacob

Message:

Fixed #1240: added better support for different names for "python" to django_bash_completion. Thanks, paolo.

Files:

• django/trunk/extras/django_bash_completion (modified) (3 diffs)

django/trunk/extras/django_bash_completion

@@ -32 +32 @@
-# To uninstall, just remove the line from your .bash_profile and .bashrc.
-
+# Enable extended pattern matching operators.
+shopt -s extglob
+
-_django_completion()
-{
@@ -59 +62 @@
-          # python manage.py, /some/path/python manage.py (if manage.py exists)
-          ( ${COMP_CWORD} -eq 2 &&
-
+?([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) &&
-            ( -r ${COMP_WORDS[1]} ) ) ]] ; then
-
@@ -136 +144 @@
-
-complete -F _django_completion django-admin.py manage.py
+
+# Support for multiple interpreters.
+unset pythons
+if command -v whereis &>/dev/null; then
+    python_interpreters=$(whereis -b python | cut -d " " -f 2-) 
+    for python in $python_interpreters; do
+        pythons="${pythons} $(basename $python)"
+    done
+    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
+else
+    pythons=python    
+fi
+
+complete -F _django_completion -o default $pythons