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

lvm: Use _parse_usage in several tools.

Browse Source 
Also adjust test cases to not fail if --help doesn't succeed, at least
it doesn't for me if run as non-root.
This commit is contained in:
Ville Skyttä 2011-05-16 18:57:43 +03:00
parent b7f1f74ba0
commit eefc69d83b
32 changed files with 123 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
completions/lvm
View File

@ -51,8 +51,7 @@ _lvmdiskscan()
_init_completion || return
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--debug --help \
--lvmpartition --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
fi
} &&
complete -F _lvmdiskscan lvmdiskscan
@ -90,10 +89,7 @@ _pvs()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--aligned --all --debug \
--help --ignorelockingfailure --noheadings \
--nosuffix --options --sort --separator --unbuffered --units \
--verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_physicalvolumes
fi
@ -113,8 +109,7 @@ _pvdisplay()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--colon --columns --units \
--verbose --debug --help --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_physicalvolumes
fi
@ -134,10 +129,7 @@ _pvchange()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--all --autobackup \
--debug --help --test --uuid \
--allocatable --verbose --addtag --deltag \
--version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_physicalvolumes
fi
@ -169,11 +161,7 @@ _pvcreate()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--restorefile --debug \
--force --help --labelsector --metadatatype \
--metadatacopies --metadatasize \
--setphysicalvolumesize --test --uuid \
--verbose --yes --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_physicalvolumes
fi
@ -211,8 +199,7 @@ _pvremove()
_init_completion || return
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--debug --force \
--help --yes --test --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_physicalvolumes
fi
@ -225,9 +212,7 @@ _vgscan()
_init_completion || return
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--debug --help \
--ignorelockingfailure --mknodes \
--partial --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
fi
} &&
complete -F _vgscan vgscan
@ -253,11 +238,7 @@ _vgs()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--aligned --debug \
--help --ignorelockingfailure --noheadings \
--nosuffix --options --sort --partial \
--separator --unbuffered --units \
--verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_volumegroups
fi
@ -277,9 +258,7 @@ _vgdisplay()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--colon --columns --units \
--partial --activevolumegroups --verbose \
--debug --help --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_volumegroups
fi
@ -352,8 +331,7 @@ _vgremove()
_init_completion || return
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--debug --help --test \
--verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_volumegroups
fi
@ -373,8 +351,7 @@ _vgrename()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--autobackup --debug \
--help --test --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_volumegroups
fi
@ -394,9 +371,7 @@ _vgreduce()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--all --autobackup \
--debug --help --removemissing --test \
--verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_args
@ -426,8 +401,7 @@ _vgextend()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--autobackup --debug \
--help --test --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_args
if [ $args -eq 0 ]; then
@ -445,8 +419,7 @@ _vgport()
_init_completion || return
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--all --debug \
--help --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_volumegroups
fi
@ -459,8 +432,7 @@ _vgck()
_init_completion || return
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--debug \
--help --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_volumegroups
fi
@ -488,9 +460,7 @@ _vgconvert()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--debug --help --labelsector \
--metadatatype --metadatacopies --metadatasize \
--test --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_volumegroups
fi
@ -510,9 +480,7 @@ _vgcfgbackup()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--debug --file --help \
--ignorelockingfailure --partial --verbose \
--version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_volumegroups
fi
@ -540,9 +508,7 @@ _vgcfgrestore()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--debug --file --list \
--help --metadatatype --name --test \
--verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_volumegroups
fi
@ -562,8 +528,7 @@ _vgmerge()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--autobackup --debug --help \
--list --test --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_volumegroups
fi
@ -607,8 +572,7 @@ _vgmknodes()
_init_completion || return
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--debug --help --verbose \
--version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_volumegroups
fi
@ -621,9 +585,7 @@ _lvscan()
_init_completion || return
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--blockdevice --debug \
--help --ignorelockingfailure \
--partial --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
fi
} &&
complete -F _lvscan lvscan
@ -647,10 +609,7 @@ _lvs()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--aligned --debug --help \
--ignorelockingfailure --noheadings --nosuffix --options \
--sort --partial --segments --separator --unbuffered --units \
--verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_logicalvolumes
fi
@ -670,8 +629,7 @@ _lvdisplay()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--colon --columns --units \
--partial --maps --verbose --debug --help --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_logicalvolumes
fi
@ -695,12 +653,7 @@ _lvchange()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--autobackup --available \
--addtag --alloc --contiguous --debug --deltag \
--force --help --ignorelockingfailure \
--persistent --major --minor --partial \
--permission --readahead --refresh --test \
--verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_logicalvolumes
fi
@ -732,12 +685,7 @@ _lvcreate()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--autobackup --addtag --alloc \
--contiguous --debug --help --stripes \
--stripesize --extents --size --persistent \
--major --minor --name --permission \
--readahead --test --type --verbose --zero \
--version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_args
if [ $args -eq 0 ]; then
@ -762,8 +710,7 @@ _lvremove()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--autobackup --debug \
--force --help --test --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_logicalvolumes
fi
@ -783,8 +730,7 @@ _lvrename()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--autobackup --debug \
--help --test --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_logicalvolumes
fi
@ -808,9 +754,7 @@ _lvreduce()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--autobackup \
--debug --force --help --extents \
--size --nofsck --resizefs --test --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_logicalvolumes
fi
@ -834,10 +778,7 @@ _lvresize()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--autobackup --alloc \
--debug --help --stripes --stripesize \
--extents --size --nofsck --resizefs \
--test --type --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_args
if [ $args -eq 0 ]; then
@ -866,10 +807,7 @@ _lvextend()
esac
if [[ "$cur" == -* ]]; then
COMPREPLY=( $( compgen -W '--autobackup --alloc \
--debug --help --stripes --stripesize \
--extents --size --nofsck --resizefs \
--test --type --verbose --version' -- "$cur" ) )
COMPREPLY=( $( compgen -W '$( _parse_usage "$1" --help )' -- "$cur" ) )
else
_args
if [ $args -eq 0 ]; then

2
test/lib/completions/lvchange.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {lvchange --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "lvchange --"
}
sync_after_int

2
test/lib/completions/lvcreate.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {lvcreate --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "lvcreate --"
}
sync_after_int

2
test/lib/completions/lvdisplay.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {lvdisplay --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "lvdisplay --"
}
sync_after_int

2
test/lib/completions/lvextend.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {lvextend --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "lvextend --"
}
sync_after_int

2
test/lib/completions/lvmdiskscan.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {lvmdiskscan --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "lvmdiskscan --"
}
sync_after_int

2
test/lib/completions/lvreduce.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {lvreduce --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "lvreduce --"
}
sync_after_int

2
test/lib/completions/lvremove.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {lvremove --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "lvremove --"
}
sync_after_int

2
test/lib/completions/lvrename.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {lvrename --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "lvrename --"
}
sync_after_int

2
test/lib/completions/lvresize.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {lvresize --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "lvresize --"
}
sync_after_int

2
test/lib/completions/lvs.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {lvs --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "lvs --"
}
sync_after_int

2
test/lib/completions/lvscan.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {lvscan --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "lvscan --"
}
sync_after_int

2
test/lib/completions/pvchange.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {pvchange --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "pvchange --"
}
sync_after_int

2
test/lib/completions/pvcreate.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {pvcreate --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "pvcreate --"
}
sync_after_int

2
test/lib/completions/pvdisplay.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {pvdisplay --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "pvdisplay --"
}
sync_after_int

2
test/lib/completions/pvremove.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {pvremove --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "pvremove --"
}
sync_after_int

2
test/lib/completions/pvs.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {pvs --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "pvs --"
}
sync_after_int

2
test/lib/completions/vgcfgbackup.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgcfgbackup --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgcfgbackup -"
}
sync_after_int

2
test/lib/completions/vgcfgrestore.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgcfgrestore --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgcfgrestore -"
}
sync_after_int

2
test/lib/completions/vgck.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgck --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgck -"
}
sync_after_int

2
test/lib/completions/vgconvert.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgconvert --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgconvert -"
}
sync_after_int

2
test/lib/completions/vgdisplay.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgdisplay --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgdisplay -"
}
sync_after_int

2
test/lib/completions/vgexport.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgexport --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgexport -"
}
sync_after_int

2
test/lib/completions/vgextend.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgextend --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgextend -"
}
sync_after_int

2
test/lib/completions/vgimport.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgimport --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgimport -"
}
sync_after_int

2
test/lib/completions/vgmerge.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgmerge --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgmerge -"
}
sync_after_int

2
test/lib/completions/vgmknodes.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgmknodes --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgmknodes -"
}
sync_after_int

2
test/lib/completions/vgreduce.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgreduce --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgreduce -"
}
sync_after_int

2
test/lib/completions/vgremove.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgremove --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgremove -"
}
sync_after_int

2
test/lib/completions/vgrename.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgrename --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgrename -"
}
sync_after_int

2
test/lib/completions/vgs.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgs --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgs -"
}
sync_after_int

2
test/lib/completions/vgscan.exp
View File

@ -11,7 +11,9 @@ proc teardown {} {
setup
if {[assert_exec {vgscan --help} "" "" "untested"]} { # may fail as non-root
assert_complete_any "vgscan -"
}
sync_after_int