svn commit: r211036 - user/dougb/portmaster/files

[Doug Barton]

Author: dougb
Date: Sat Aug  7 20:07:15 2010
New Revision: 211036
URL: http://svn.freebsd.org/changeset/base/211036

Log:
  Add a $FreeBSD line
  
  Re-sort the --options to make it easier to maintain
  
  Use a better method of generating completions for portmaster [a-z]<TAB>

Modified:
  user/dougb/portmaster/files/bash-completions

Modified: user/dougb/portmaster/files/bash-completions
==============================================================================
--- user/dougb/portmaster/files/bash-completions	Sat Aug  7 19:27:49 2010	(r211035)
+++ user/dougb/portmaster/files/bash-completions	Sat Aug  7 20:07:15 2010	(r211036)
@@ -1,3 +1,5 @@
+# $FreeBSD$
+#
 _portmaster () {
 	local cur
 	cur=${COMP_WORDS[COMP_CWORD]}
@@ -7,18 +9,21 @@ _portmaster () {
 		COMPREPLY=( $( compgen -d $cur ) ) ;;
 	*/*)	COMPREPLY=( $( compgen -d /usr/ports/$cur ) ) ;;
 	--*)	COMPREPLY=( $( compgen -W '--force-config --show-work \
-		--clean-distfiles --clean-distfiles-all	--check-depends \
-		--check-port-dbdir --list-origins --packages --packages-only \
+		--packages --packages-only \
 		--packages-build --packages-if-newer --delete-build-only \
-		--always-fetch --packages-delete \
+		--always-fetch --delete-packages \
 		--local-packagedir= --packages-local \
 		--no-confirm --no-term-title --no-index-fetch \
 		--index --index-first --index-only \
+		--clean-distfiles --clean-distfiles-all	\
+		--clean-packages --clean-packages-all \
+		--check-depends --check-port-dbdir --list-origins \
 		--help --version' -- $cur ) )
 		;;
 	*)	COMPREPLY=( $( compgen -d /var/db/pkg/$cur ) )
 		COMPREPLY=( ${COMPREPLY[@]#/var/db/pkg/} )
-		COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -d /usr/ports/$cur/ ) )
+		COMPREPLY=( ${COMPREPLY[@]} $( compgen -d /usr/ports/$cur ) )
+		COMPREPLY=( ${COMPREPLY[@]#/ports/} )
 		;;
 	esac