rpms/bash-completion/devel bash-completion.profile, 1.3, 1.4 bash-completion.spec, 1.14, 1.15

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9901

Modified Files:
	bash-completion.profile bash-completion.spec 
Log Message:
* Wed Feb  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-4
- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.



Index: bash-completion.profile
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.profile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bash-completion.profile	28 Nov 2005 20:26:32 -0000	1.3
+++ bash-completion.profile	8 Feb 2006 16:55:38 -0000	1.4
@@ -1,6 +1,9 @@
 # check for bash (and that we haven't already been sourced, see eg. #174355)
 [ -z "$BASH_VERSION" -o -n "$BASH_COMPLETION" ] && return
 
+# skip non-interactive shells
+[[ $- == *i* ]] || return
+
 # check for correct version of bash
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
 if [ -r /etc/bash_completion ] && \


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bash-completion.spec	4 Feb 2006 19:11:14 -0000	1.14
+++ bash-completion.spec	8 Feb 2006 16:55:38 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20050721
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -69,15 +69,21 @@
 
 %bashcomp_trigger bittorrent
 %bashcomp_trigger cksfv
+%bashcomp_trigger clisp
 %bashcomp_trigger freeciv
+%bashcomp_trigger gcc-gnat gnatmake
 %bashcomp_trigger gkrellm
 %bashcomp_trigger mailman
 %bashcomp_trigger mcrypt
 %bashcomp_trigger mock
 %bashcomp_trigger mtx
 %bashcomp_trigger plague-client
+%bashcomp_trigger ruby-ri ri
+%bashcomp_trigger sbcl
+%bashcomp_trigger snownews
 %bashcomp_trigger subversion
 %bashcomp_trigger unace
+%bashcomp_trigger unixODBC isql
 %bashcomp_trigger unrar
 %bashcomp_trigger yum-utils repomanage
 
@@ -92,6 +98,10 @@
 
 
 %changelog
+* Wed Feb  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-4
+- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
+- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.
+
 * Sat Feb  4 2006 Ville Skyttä <ville.skytta at iki.fi>
 - Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).