[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 2770bc6927829d080f22c87d552d12abc6c7fe72

[Freddy Vulto (none)]

The following commit has been merged in the master branch:
commit 2770bc6927829d080f22c87d552d12abc6c7fe72
Merge: 976fafa07e57f1e0085c08c55d7453098197fe98 8858c8df335417825b415546dc39f2defef39424
Author: Freddy Vulto <freddy at rebase.(none)>
Date:   Sat Jun 20 09:37:50 2009 +0200

    Merge branch 'fvu'

diff --combined bash_completion
index 2b7e589,d5ddf5c..7cc109f
--- a/bash_completion
+++ b/bash_completion
@@@ -1085,7 -1085,7 +1085,7 @@@ _known_hosts_real(
  		esac
  	done
  	[ $# -ge $OPTIND ] && echo "error: $FUNCNAME("$@"): unprocessed arguments:"\
- 	    $(while [ $# -gt 0 ]; do echo ${!OPTIND}; shift; done)
+ 	    $(while [ $# -ge $OPTIND ]; do echo ${!OPTIND}; shift; done)
  
  	[[ $cur == *@* ]] && user=${cur%@*}@ && cur=${cur#*@}
  	kh=()
@@@ -1195,13 -1195,10 +1195,13 @@@
  	    fi
  
          # Add hosts reported by avahi, if it's available
 +        # and if the daemon is started.
          if type avahi-browse >&/dev/null; then
 -        COMPREPLY=( "${COMPREPLY[@]}" $(
 -            compgen -W "$( avahi-browse -kcpr _workstation._tcp | \
 -                           grep ^= | cut -d\; -f7 | sort -u )" -- $cur ) )
 +            if [ -n "$(pidof avahi-daemon)" ]; then
 +                COMPREPLY=( "${COMPREPLY[@]}" $(
 +                    compgen -W "$( avahi-browse -kcpr _workstation._tcp | \
 +                                   grep ^= | cut -d\; -f7 | sort -u )" -- $cur ) )
 +            fi
          fi
  
  	    # Now add results of normal hostname completion

-- 
bash-completion