csonto/bash-completion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modprobe: fix params with multi-line descriptions

Browse Source 
The command `modprobe -p nouveau` outputs:

    tv_norm:Default TV norm.
    		Supported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,
    			hd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.
    		Default: PAL
    		*NOTE* Ignored for cards with external TV encoders. (charp)
    tv_disable:Disable TV-out detection (int)
    ...

This breaks module parameter auto-completion, so only suggest parameters
which are not preceded by whitespace. Tested with kmod 17-1 on Arch
Linux.

Modified-By: Ville Skyttä <ville.skytta@iki.fi>
This commit is contained in:
Peter Wu 2014-06-08 12:55:01 +02:00 committed by Ville Skyttä
parent d238ab5445
commit 454f67a047
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
completions/modprobe
View File

@ -74,7 +74,8 @@ _modprobe()
elif [[ -n "$module" ]]; then elif [[ -n "$module" ]]; then
# do module parameter completion # do module parameter completion
COMPREPLY=( $( compgen -W "$( PATH="$PATH:/sbin" modinfo \ COMPREPLY=( $( compgen -W "$( PATH="$PATH:/sbin" modinfo \
-p "$module" 2>/dev/null | cut -d: -f1 )" -- "$cur" ) ) -p "$module" 2>/dev/null | \
awk -F: '!/^[ \t]/ { print $1 }' )" -- "$cur" ) )
else else
_modules $version _modules $version
if [[ $COMPREPLY ]]; then if [[ $COMPREPLY ]]; then