diff options
author | Tom Gundersen <teg@jklm.no> | 2011-06-27 01:00:32 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2011-06-27 01:00:32 +0200 |
commit | 98f63a928fbf2184d8139599b1fd64cf43424691 (patch) | |
tree | 245a395b944c1330e59f690e8680c5754f9b93c7 | |
parent | fc9ce46483fc4df673c4f2f23eeeb405d1040c4b (diff) | |
parent | 0ab093ba1cfc2d0aeadfc5a0c2af59f80781b5fa (diff) | |
download | initscripts-98f63a928fbf2184d8139599b1fd64cf43424691.tar.xz |
Merge remote-tracking branch 'seblu/master'
-rw-r--r-- | bash-completion | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bash-completion b/bash-completion index 489b5dc..e63e880 100644 --- a/bash-completion +++ b/bash-completion @@ -2,18 +2,18 @@ _rc.d () { - local action="help list start stop reload restart" - local cur="${COMP_WORDS[COMP_CWORD]}" - local caction="${COMP_WORDS[1]}" + local action cur prev + action="help list start stop reload restart" + _get_comp_words_by_ref cur prev if ((COMP_CWORD == 1)); then COMPREPLY=($(compgen -W "${action}" -- "$cur")) - elif [[ "$caction" == help ]]; then + elif [[ "$prev" == help ]]; then COMPREPLY=() - elif [[ "$caction" == list ]]; then + elif [[ "$prev" == list ]]; then ((COMP_CWORD == 2)) && COMPREPLY=($(compgen -W "started stopped" -- "$cur")) || COMPREPLY=() - elif [[ "$caction" == start ]]; then + elif [[ "$prev" == start ]]; then COMPREPLY=($(comm -23 <(cd /etc/rc.d && compgen -f -X 'functions*' "$cur"|sort) <(cd /run/daemons/ && compgen -f "$cur"|sort))) - elif [[ "$caction" =~ stop|restart|reload ]]; then + elif [[ "$prev" =~ stop|restart|reload ]]; then COMPREPLY=($(cd /run/daemons/ && compgen -f "$cur"|sort)) elif ((COMP_CWORD > 1)); then COMPREPLY=($(cd /etc/rc.d && compgen -f -X 'functions*' "$cur"|sort)) |