From 2af5044992620f2d6b87e2f58626e01da2919cc3 Mon Sep 17 00:00:00 2001
From: Tom Grennan <tgrennan@vyatta.com>
Date: Mon, 4 Feb 2008 10:35:18 -0800
Subject: fix (or at least improve) bug 2519

---
 etc/bash_completion.d/10vyatta-op | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/bash_completion.d/10vyatta-op b/etc/bash_completion.d/10vyatta-op
index c61a3c5..c3a778e 100644
--- a/etc/bash_completion.d/10vyatta-op
+++ b/etc/bash_completion.d/10vyatta-op
@@ -204,6 +204,18 @@ _vyatta_op_set_completions ()
     _vyatta_op_completions=($( printf "%s\n" ${completions[@]} | sort -u ))
 }
 
+_vyatta_op_comprely_needs_ambiguity ()
+{
+    local -a uniq
+
+    [ ${#COMPREPLY[@]} -eq 1 ] && return
+
+    uniq=( `printf "%s\n" ${COMPREPLY[@]} | cut -c1 | sort -u` )
+
+    [ ${#uniq[@]} -eq 1 ] && return
+    false
+}
+
 _vyatta_op_expand ()
 {
     local restore_shopts=$( shopt -p extglob nullglob | tr \\n \; )
@@ -249,7 +261,7 @@ _vyatta_op_expand ()
 	    if [ -z "$comp" ] ; then
 		if [ ${#COMPREPLY[@]} -eq 0 ] ; then
 		    COMPREPLY+=( " " "" )
-		else
+		elif _vyatta_op_comprely_needs_ambiguity ; then
 		    COMPREPLY+=( " " )
 		fi
 	    fi
-- 
cgit v1.2.3