From 9f7c84583357a22fd4813de45bfd81843bda5bc8 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: Feb 08 2006 16:55:38 +0000
Subject: - Don't source ourselves in non-interactive shells (#180419, Behdad

    Esfahbod).
- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and
    snownews.

---

diff --git a/bash-completion.profile b/bash-completion.profile
index b6a9e17..3264537 100644
--- a/bash-completion.profile
+++ b/bash-completion.profile
@@ -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 ] && \
diff --git a/bash-completion.spec b/bash-completion.spec
index 288d60c..5f5c55f 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -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 @@ fi\
 
 %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 @@ fi\
 
 
 %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).