[Bash-completion-commits] [SCM] bash-completion branch, frozen/1.0, updated. ad7f198193d7cb15952de60cad9224e70e29b174

[Ville Skyttä]

The following commit has been merged in the frozen/1.0 branch:
commit ad7f198193d7cb15952de60cad9224e70e29b174
Merge: d3834c499699982655c62553fece79f6a902b4e7 edd120e212ccd54d8fbcf87ec7c55210a8353bb6
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Mar 23 22:56:46 2009 +0200

    Merge branch 'frozen/1.0' of git+ssh://scop-guest@git.debian.org/git/bash-completion/bash-completion into frozen/1.0

diff --combined CHANGES
index b97e48d,5c36071..3ef768a
--- a/CHANGES
+++ b/CHANGES
@@@ -76,6 -76,7 +76,7 @@@ bash-completion (1.0
      go. After it gets accepted, the completion would go into contrib/.
    * Remove unused UNAME local variable in _info() (Closes: #501843)
    * AUTHORS added
+   * Make _alias() use _get_cword
    * Merge from Gentoo:
      - fix 'find' completion so that it properly completes on -?(i)whilename.
        Patch by Ciaran McCreesh.
@@@ -136,7 -137,6 +137,7 @@@
      (RHBZ: #486998).
    * Apply ps2pdf completion to ps2pdf{12,13,14,wr} too.
    * Simplify bash_completion.sh, return earlier in non-applicable environments.
 +  * Remove obsolete --buildarch and --buildos rpm(build) completions.
  
    [ Freddy Vulto ]
    * Restored `_display()' completion for `display' by removing
@@@ -154,7 -154,7 +155,7 @@@
    [ Santiago M. Mola ]
    * Add .ape to mplayer supported extensions (Alioth#311510).
  
-  -- David Paleino <d.paleino at gmail.com>  Tue, 17 Feb 2009 09:14:09 +0100
+  -- David Paleino <d.paleino at gmail.com>  Thu, 19 Mar 2009 19:41:38 +0100
  
  bash-completion (20080705) unstable; urgency=low
  
diff --combined bash_completion
index f95192c,c66f54e..9a0f0e6
--- a/bash_completion
+++ b/bash_completion
@@@ -540,6 -540,25 +540,25 @@@ _usergroup(
  	fi
  }
  
+ 
+ # Get real command.
+ # - arg: $1  Command
+ # - stdout:  Filename of command in PATH with possible symbolic links resolved.
+ #            Empty string if command not found.
+ # - return:  True (0) if command found, False (> 0) if not.
+ _realcommand() {
+ 	type -P "$1" > /dev/null && {
+ 		if type -p realpath > /dev/null; then
+ 			realpath "$(type -P "$1")"
+ 		elif type -p readlink > /dev/null; then
+ 			readlink -f "$(type -P "$1")"
+ 		else
+ 			type -P "$1"
+ 		fi
+ 	}
+ }
+ 
+ 
  # this function count the number of mandatory args
  #
  _count_args()
@@@ -2154,7 -2173,8 +2173,7 @@@ _rpm(
  		if [[ "$cur" == -* ]]; then
  			COMPREPLY=( $( compgen -W '--short-circuit --timecheck \
  			--clean --rmsource --rmspec --test --sign --buildroot \
 -			--target -- buildarch --buildos --nobuild --nodeps \
 -			--nodirtokens' -- $cur ) )
 +			--target --nobuild --nodeps --nodirtokens' -- $cur ) )
  		elif [[ ${COMP_WORDS[1]} == -b* ]]; then
  			_filedir 'spec'
  		else
@@@ -9062,35 -9082,6 +9081,6 @@@ _smartctl(
  complete -F _smartctl smartctl
  }
  
- # vncviewer(1) completion
- #
- have vncviewer &&
- _vncviewer()
- {
- 	local cur prev
- 	local -a config
- 
- 	COMPREPLY=()
- 	cur=`_get_cword`
- 	prev=${COMP_WORDS[COMP_CWORD-1]}
- 
- 	case "$prev" in
- 	-via)
- 	   _known_hosts -a
- 	   ;;
- 	*)
- 	   # ssh into the the server, find and ping the broadcast address, then
- 	   # sort and show the results.
- 	   COMPREPLY=( $( ssh -o 'Batchmode yes' $prev \
- 			  "ping -bnc 4 255.255.255.255" 2>/dev/null | \
- 			  awk -F ' ' '{print $4}' | \
- 			  sort -n | uniq | egrep '[0-9]+\.[0-9]+\.' 2>/dev/null ) )
- 	esac
- 
- 	return 0
- } &&
- complete -F _vncviewer vncviewer
- 
  # sysctl(8) completion
  #
  have sysctl &&
diff --combined debian/changelog
index 6480f80,be7e1aa..cd57533
--- a/debian/changelog
+++ b/debian/changelog
@@@ -137,7 -137,6 +137,7 @@@ bash-completion (1:1.0-1) UNRELEASED; u
      (RHBZ: #486998).
    * Apply ps2pdf completion to ps2pdf{12,13,14,wr} too.
    * Simplify bash_completion.sh, return earlier in non-applicable environments.
 +  * Remove obsolete --buildarch and --buildos rpm(build) completions.
  
    [ Freddy Vulto ]
    * Restored `_display()' completion for `display' by removing
@@@ -155,7 -154,7 +155,7 @@@
    [ Santiago M. Mola ]
    * Add .ape to mplayer supported extensions (Alioth#311510).
  
-  -- Freddy Vulto <fvulto at gmail.com>  Wed, 25 Feb 2009 21:16:46 +0100
+  -- David Paleino <d.paleino at gmail.com>  Thu, 19 Mar 2009 19:41:38 +0100
  
  bash-completion (20080705) unstable; urgency=low
  

-- 
bash-completion