[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 38516ee43194fd496971a9c37e23109f3816e4bf

[Guillaume Rousse]

The following commit has been merged in the master branch:
commit 38516ee43194fd496971a9c37e23109f3816e4bf
Merge: 8c483668c1ae20d54b7f007e2596f459dd62d2ca 3f0bfbc5aea5efb1d9b20384e8291d9785bf3ae0
Author: Guillaume Rousse <guillaume at oberkampf.msr-inria.inria.fr>
Date:   Thu Dec 31 17:36:20 2009 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/bash-completion/bash-completion

diff --combined Makefile.am
index 5b1a061,db0fbab..aa67708
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,4 -1,4 +1,4 @@@
 -AUTOMAKE_OPTIONS = dist-bzip2
 +SUBDIRS = test
  
  sysconf_DATA = bash_completion
  
@@@ -117,6 -117,7 +117,7 @@@ bashcomp_DATA = contrib/abook 
  		contrib/rpmcheck \
  		contrib/rrdtool \
  		contrib/rsync \
+ 		contrib/rtcwake \
  		contrib/samba \
  		contrib/sbcl \
  		contrib/screen \
@@@ -155,10 -156,5 +156,10 @@@
  profiledir = $(sysconfdir)/profile.d
  profile_DATA = bash_completion.sh
  
 -EXTRA_DIST = CHANGES $(sysconf_DATA) $(bashcomp_DATA) $(profile_DATA) \
 +bash_completion.sh: bash_completion.sh.in Makefile
 +	sed -e 's|@sysconfdir[@]|$(sysconfdir)|' <$(srcdir)/$@.in >$@
 +
 +CLEANFILES = bash_completion.sh
 +
 +EXTRA_DIST = CHANGES $(sysconf_DATA) $(bashcomp_DATA) bash_completion.sh.in \
  	contrib/_modules contrib/_subversion contrib/_yum contrib/_yum-utils
diff --combined test/lib/library.exp
index e5ce971,1af23f3..0e457c8
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@@ -417,6 -417,16 +417,16 @@@ proc assert_exec {cmd {stdout ''} {tes
  }; # assert_exec()
  
  
+ # Sort list.
+ # `exec sort' is used instead of `lsort' to achieve exactly the
+ #  same sort order as in bash.
+ # @param list $items
+ # @return list  Sort list
+ proc bash_sort {items} {
+     return [split [exec sort << [join $items "\n"]] "\n"]
+ }; # bash_sort()
+ 
+ 
  # Get hostnames
  # @return list  Hostnames
  proc get_hosts {} {
@@@ -467,16 -477,6 +477,6 @@@ proc get_signals {} 
  }; # get_signals()
  
  
- # Sort list.
- # `exec sort' is used instead of `lsort' to achieve exactly the
- #  same sort order as in bash.
- # @param list $items
- # @return list  Sort list
- proc bash_sort {items} {
-     return [split [exec sort << [join $items "\n"]] "\n"]
- }; # bash_sort()
- 
- 
  # Initialize tcl globals with bash variables
  proc init_tcl_bash_globals {} {
      global BASH_VERSINFO BASH_VERSION COMP_WORDBREAKS
@@@ -488,6 -488,12 +488,12 @@@
  }; # init_tcl_bash_globals()
  
  
+ # Detect if test suite is running under Cygwin/Windows
+ proc is_cygwin {} {
+     expr {[string first [string tolower [exec uname -s]] cygwin] >= 0}
+ }; # is_cygwin()
+ 
+ 
  # Expect items.
  # Break items into chunks because `expect' seems to have a limited buffer size
  # @param list $items
@@@ -591,7 -597,6 +597,7 @@@ proc _save_env {{file ""}} 
  # Source bash_completion package
  proc source_bash_completion {} {
      assert_bash_exec {BASH_COMPLETION_DIR=$(cd $TESTDIR/..; pwd)/contrib}
 +    assert_bash_exec {BASH_COMPLETION_COMPAT_DIR=$BASH_COMPLETION_DIR}
      assert_bash_exec {BASH_COMPLETION=$(cd $TESTDIR/..; pwd)/bash_completion}
      assert_bash_exec {source $BASH_COMPLETION}
  }; # source_bash_completion()

-- 
bash-completion