[62571] trunk/dports/sysutils/bash-completion

[raimue at macports.org]

Revision: 62571
          http://trac.macports.org/changeset/62571
Author:   raimue at macports.org
Date:     2010-01-11 03:57:19 -0800 (Mon, 11 Jan 2010)
Log Message:
-----------
sysutils/bash-completion:
Add pseudo-port names to completion of port names, fixes #23221

Modified Paths:
--------------
    trunk/dports/sysutils/bash-completion/Portfile
    trunk/dports/sysutils/bash-completion/files/port

Modified: trunk/dports/sysutils/bash-completion/Portfile
===================================================================
--- trunk/dports/sysutils/bash-completion/Portfile	2010-01-11 11:54:44 UTC (rev 62570)
+++ trunk/dports/sysutils/bash-completion/Portfile	2010-01-11 11:57:19 UTC (rev 62571)
@@ -4,7 +4,7 @@
 
 name            bash-completion
 version         1.1
-revision        2
+revision        3
 epoch           1
 categories      sysutils
 platforms       darwin

Modified: trunk/dports/sysutils/bash-completion/files/port
===================================================================
--- trunk/dports/sysutils/bash-completion/files/port	2010-01-11 11:54:44 UTC (rev 62570)
+++ trunk/dports/sysutils/bash-completion/files/port	2010-01-11 11:57:19 UTC (rev 62571)
@@ -6,8 +6,10 @@
 # 
 _port()
 {
-        local cur prev mode count portdir cmdfile i port
+        local cur prev mode count portdir cmdfile i port PSEUDOPORTS
 
+        PSEUDOPORTS=( all current active inactive installed uninstalled outdated obsolete )
+
         COMPREPLY=()
         cur=${COMP_WORDS[COMP_CWORD]}
         prev=${COMP_WORDS[COMP_CWORD-1]}
@@ -97,19 +99,25 @@
                 contents|installed|outdated|uninstall|upgrade)
                     # installed ports
                     COMPREPLY=( $( port -q installed "$cur*" \
-                        | awk '{print $1}' | uniq ) )
+                        | awk '{print $1}' | uniq ) \
+                        $( compgen -W '${PSEUDOPORTS[@]}' -- $cur ) \
+                    )
                     return 0
                     ;;
                 activate)
                     # inactive ports
                     COMPREPLY=( $( port -q installed "$cur*" | grep -v '(active)' \
-                        | awk '{print $1}' | uniq ) )
+                        | awk '{print $1}' | uniq ) \
+                        $( compgen -W '${PSEUDOPORTS[@]}' -- $cur ) \
+                    )
                     return 0
                     ;;
                 deactivate)
                     # active ports
                     COMPREPLY=( $( port -q installed "$cur*" | grep '(active)' \
-                        | awk '{print $1}' | uniq ) )
+                        | awk '{print $1}' | uniq ) \
+                        $( compgen -W '${PSEUDOPORTS[@]}' -- $cur ) \
+                    )
                     return 0
                     ;;
                 provides|cmdfile)
@@ -126,7 +134,9 @@
                     ;;
                 *)
                     # all ports
-                    COMPREPLY=( $( port -q search --glob "$cur*" 2>/dev/null | uniq ) )
+                    COMPREPLY=( $( port -q search --glob "$cur*" 2>/dev/null | uniq ) \
+                        $( compgen -W '${PSEUDOPORTS[@]}' -- $cur ) \
+                    )
                     return 0
                     ;;
                 esac
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100111/a1e918f7/attachment.html>