Use _init_completion() in completions/j*.
This commit is contained in:
parent
6ea5b13d4d
commit
7a4ef9e4a9
@ -4,17 +4,15 @@ have jar || return
|
|||||||
|
|
||||||
_jar()
|
_jar()
|
||||||
{
|
{
|
||||||
local cur
|
local cur prev words cword
|
||||||
|
_init_completion || return
|
||||||
|
|
||||||
COMPREPLY=()
|
if [[ $cword -eq 1 ]]; then
|
||||||
_get_comp_words_by_ref cur
|
|
||||||
|
|
||||||
if [[ $COMP_CWORD -eq 1 ]]; then
|
|
||||||
COMPREPLY=( $( compgen -W 'c t x u' -- "$cur" ) )
|
COMPREPLY=( $( compgen -W 'c t x u' -- "$cur" ) )
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case ${COMP_WORDS[1]} in
|
case ${words[1]} in
|
||||||
*c*f)
|
*c*f)
|
||||||
_filedir
|
_filedir
|
||||||
;;
|
;;
|
||||||
|
@ -124,10 +124,10 @@ _java_packages()
|
|||||||
have java &&
|
have java &&
|
||||||
_java()
|
_java()
|
||||||
{
|
{
|
||||||
local cur prev words cword i
|
local cur prev words cword
|
||||||
|
_init_completion -n : || return
|
||||||
|
|
||||||
COMPREPLY=()
|
local i
|
||||||
_get_comp_words_by_ref -n : cur prev words cword
|
|
||||||
|
|
||||||
for ((i=1; i < $cword; i++)); do
|
for ((i=1; i < $cword; i++)); do
|
||||||
case ${words[$i]} in
|
case ${words[$i]} in
|
||||||
@ -242,10 +242,8 @@ complete -F _java java
|
|||||||
have javadoc &&
|
have javadoc &&
|
||||||
_javadoc()
|
_javadoc()
|
||||||
{
|
{
|
||||||
COMPREPLY=()
|
local cur prev words cword
|
||||||
local cur prev
|
_init_completion || return
|
||||||
|
|
||||||
_get_comp_words_by_ref cur prev
|
|
||||||
|
|
||||||
case $prev in
|
case $prev in
|
||||||
-overview|-helpfile)
|
-overview|-helpfile)
|
||||||
@ -294,10 +292,8 @@ complete -F _javadoc javadoc
|
|||||||
have javac &&
|
have javac &&
|
||||||
_javac()
|
_javac()
|
||||||
{
|
{
|
||||||
COMPREPLY=()
|
local cur prev words cword
|
||||||
local cur prev
|
_init_completion || return
|
||||||
|
|
||||||
_get_comp_words_by_ref cur prev
|
|
||||||
|
|
||||||
case $prev in
|
case $prev in
|
||||||
-d)
|
-d)
|
||||||
@ -326,9 +322,8 @@ complete -F _javac javac
|
|||||||
have pack200 &&
|
have pack200 &&
|
||||||
_pack200()
|
_pack200()
|
||||||
{
|
{
|
||||||
COMPREPLY=()
|
local cur prev words cword
|
||||||
local cur prev
|
_init_completion || return
|
||||||
_get_comp_words_by_ref cur prev
|
|
||||||
|
|
||||||
case $prev in
|
case $prev in
|
||||||
-S|--segment-limit|-P|--pass-file|-C|--class-attribute|\
|
-S|--segment-limit|-P|--pass-file|-C|--class-attribute|\
|
||||||
@ -369,8 +364,8 @@ _pack200()
|
|||||||
|
|
||||||
# Check if a pack or a jar was already given.
|
# Check if a pack or a jar was already given.
|
||||||
local i pack=false jar=false
|
local i pack=false jar=false
|
||||||
for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
|
for (( i=0; i < ${#words[@]}-1; i++ )) ; do
|
||||||
case ${COMP_WORDS[i]} in
|
case ${words[i]} in
|
||||||
*.pack|*.pack.gz) pack=true ;;
|
*.pack|*.pack.gz) pack=true ;;
|
||||||
*.jar) jar=true ;;
|
*.jar) jar=true ;;
|
||||||
esac
|
esac
|
||||||
@ -399,9 +394,8 @@ complete -F _pack200 pack200
|
|||||||
have unpack200 &&
|
have unpack200 &&
|
||||||
_unpack200()
|
_unpack200()
|
||||||
{
|
{
|
||||||
COMPREPLY=()
|
local cur prev words cword
|
||||||
local cur prev
|
_init_completion || return
|
||||||
_get_comp_words_by_ref cur prev
|
|
||||||
|
|
||||||
case $prev in
|
case $prev in
|
||||||
'-?'|-h|--help|-V|--version|-J)
|
'-?'|-h|--help|-V|--version|-J)
|
||||||
@ -420,8 +414,8 @@ _unpack200()
|
|||||||
|
|
||||||
# Check if a pack or a jar was already given.
|
# Check if a pack or a jar was already given.
|
||||||
local i pack=false jar=false
|
local i pack=false jar=false
|
||||||
for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
|
for (( i=0; i < ${#words[@]}-1; i++ )) ; do
|
||||||
case ${COMP_WORDS[i]} in
|
case ${words[i]} in
|
||||||
*.pack|*.pack.gz) pack=true ;;
|
*.pack|*.pack.gz) pack=true ;;
|
||||||
*.jar) jar=true ;;
|
*.jar) jar=true ;;
|
||||||
esac
|
esac
|
||||||
@ -445,9 +439,8 @@ complete -F _unpack200 unpack200
|
|||||||
have jarsigner &&
|
have jarsigner &&
|
||||||
_jarsigner()
|
_jarsigner()
|
||||||
{
|
{
|
||||||
COMPREPLY=()
|
local cur prev words cword
|
||||||
local cur prev
|
_init_completion || return
|
||||||
_get_comp_words_by_ref cur prev
|
|
||||||
|
|
||||||
case $prev in
|
case $prev in
|
||||||
-keystore)
|
-keystore)
|
||||||
@ -475,9 +468,9 @@ _jarsigner()
|
|||||||
|
|
||||||
# Check if a jar was already given.
|
# Check if a jar was already given.
|
||||||
local i jar=false
|
local i jar=false
|
||||||
for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
|
for (( i=0; i < ${#words[@]}-1; i++ )) ; do
|
||||||
if [[ "${COMP_WORDS[i]}" == *.jar && \
|
if [[ "${words[i]}" == *.jar && \
|
||||||
"${COMP_WORDS[i-1]}" != -signedjar ]] ; then
|
"${words[i-1]}" != -signedjar ]] ; then
|
||||||
jar=true
|
jar=true
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
@ -500,9 +493,8 @@ complete -F _jarsigner jarsigner
|
|||||||
have javaws &&
|
have javaws &&
|
||||||
_javaws()
|
_javaws()
|
||||||
{
|
{
|
||||||
COMPREPLY=()
|
local cur prev words cword
|
||||||
local cur prev
|
_init_completion || return
|
||||||
_get_comp_words_by_ref cur prev
|
|
||||||
|
|
||||||
case $prev in
|
case $prev in
|
||||||
-help|-license|-about|-viewer|-arg|-param|-property|-update|-umask)
|
-help|-license|-about|-viewer|-arg|-param|-property|-update|-umask)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user