From 59de496c564ff1305c012d8dcfebee0d1836c798 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 24 Mar 2008 09:59:01 +0000 Subject: [PATCH] Fix bash completion for feeds2* --- src/libprs500/linux.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libprs500/linux.py b/src/libprs500/linux.py index a4777ff39e..c4fb551f6e 100644 --- a/src/libprs500/linux.py +++ b/src/libprs500/linux.py @@ -77,13 +77,13 @@ def options(option_parser): return opts def opts_and_words(name, op, words): - opts = ' '.join(options(op)) - words = [repr(w) for w in words] - words = ' '.join(words) + opts = '|'.join(options(op)) + words = '|'.join([w.replace("'", "\\'") for w in words]) return '_'+name+'()'+\ ''' { local cur prev opts + local IFS=$'|\\t' COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" opts="%s" @@ -92,10 +92,12 @@ def opts_and_words(name, op, words): case "${cur}" in -* ) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + COMPREPLY=( $( echo ${COMPREPLY[@]} | sed 's/ /\\\\ /g' | tr '\\n' '\\t' ) ) return 0 ;; * ) COMPREPLY=( $(compgen -W "${words}" -- ${cur}) ) + COMPREPLY=( $( echo ${COMPREPLY[@]} | sed 's/ /\\\\ /g' | tr '\\n' '\\t' ) ) return 0 ;; esac