From 97e2f98fab263633c017d24b29ff0f21a2d01c4c Mon Sep 17 00:00:00 2001 From: Freddy Vulto Date: Wed, 25 Feb 2009 21:30:42 +0100 Subject: [PATCH] Fixed unset $ODBCINI bug in _isql() Fix _isql completion waiting for grep input if $ODBCINI not set; handle whitespace in $ODBCINI. Conflicts: debian/changelog --- contrib/isql | 2 +- debian/changelog | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/isql b/contrib/isql index 84eba203..fd66af58 100644 --- a/contrib/isql +++ b/contrib/isql @@ -8,6 +8,6 @@ _isql() local cur cur=`_get_cword` - COMPREPLY=( $( grep \\[$cur $ODBCINI | tr -d \\[\\] ) ) + [ -f "$ODBCINI" ] && COMPREPLY=( $( grep \\[$cur "$ODBCINI" | tr -d \\[\\] ) ) } complete -F _isql isql diff --git a/debian/changelog b/debian/changelog index 05a70f6c..a8a054bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -143,8 +143,10 @@ bash-completion (1:1.0-1) UNRELEASED; urgency=low * Prevent completion dir from being sourced twice if BASH_COMPLETION_DIR and BASH_COMPLETION_COMPAT_DIR are equal (Alioth#311433) * Make `_mii-tool()' and `_mii-diag()' POSIX-compliant + * Fix _isql completion waiting for grep input if $ODBCINI not set; handle + whitespace in $ODBCINI. - -- Freddy Vulto Sun, 22 Feb 2009 11:32:41 +0100 + -- Freddy Vulto Wed, 25 Feb 2009 21:16:46 +0100 bash-completion (20080705) unstable; urgency=low