Changeset 7768 for django/branches/gis/extras
- Timestamp:
- 06/26/08 10:11:55 (7 months ago)
- Files:
-
- django/branches/gis (modified) (1 prop)
- django/branches/gis/extras/django_bash_completion (modified) (4 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/gis
- Property svnmerge-integrated changed from /django/trunk:1-7641 to /django/trunk:1-7767
django/branches/gis/extras/django_bash_completion
- Property svn:executable set to *
r7354 r7768 45 45 opts="--help --settings --pythonpath --noinput --noreload --format --indent --verbosity --adminmedia --version" 46 46 # Actions 47 actions="adminindex createcachetable dbshell diffsettings \47 actions="adminindex createcachetable createsuperuser dbshell diffsettings \ 48 48 dumpdata flush inspectdb loaddata reset runfcgi runserver \ 49 49 shell sql sqlall sqlclear sqlcustom sqlflush sqlindexes \ … … 54 54 action_runfcgi_opts="host port socket method maxspare minspare maxchildren daemonize pidfile workdir" 55 55 56 if [[ # django-admin.py, ./manage, manage.py56 if [[ # django-admin.py, django-admin, ./manage, manage.py 57 57 ( ${COMP_CWORD} -eq 1 && 58 58 ( ${COMP_WORDS[0]} == django-admin.py || 59 ${COMP_WORDS[0]} == django-admin || 59 60 ${COMP_WORDS[0]} == ./manage.py || 60 61 ${COMP_WORDS[0]} == manage.py ) ) … … 69 70 ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) && 70 71 ( $( basename -- ${COMP_WORDS[1]} ) == django-admin.py) && 72 ( -r ${COMP_WORDS[1]} ) ) 73 || 74 ( ${COMP_CWORD} -eq 2 && 75 ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) && 76 ( $( basename -- ${COMP_WORDS[1]} ) == django-admin) && 71 77 ( -r ${COMP_WORDS[1]} ) ) ]] ; then 72 78 … … 143 149 } 144 150 145 complete -F _django_completion django-admin.py manage.py 151 complete -F _django_completion django-admin.py manage.py django-admin 146 152 147 153 # Support for multiple interpreters.
