Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates bash completions to be compatible with zsh #7261

Merged
merged 2 commits into from
Apr 30, 2020
Merged

Updates bash completions to be compatible with zsh #7261

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6e84f9
Updates bash completions to be compatible with zsh
cachance7 Apr 30, 2020
4d97e37
Uses builtin check rather than env var
cachance7 Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 28 additions & 19 deletions misc/completion/ipfs-completion.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
_do_comp()
{
if [[ $(type compopt) == *"builtin" ]]; then
compopt $@
else
complete $@
fi
}

_ipfs_comp()
{
COMPREPLY=( $(compgen -W "$1" -- ${word}) )
if [[ ${#COMPREPLY[@]} == 1 && ${COMPREPLY[0]} == "--"*"=" ]] ; then
# If there's only one option, with =, then discard space
compopt -o nospace
_do_comp -o nospace
fi
}

Expand Down Expand Up @@ -271,7 +280,7 @@ _ipfs_files_mv()
_ipfs_files_complete
else
COMPREPLY=( / )
[[ $COMPREPLY = */ ]] && compopt -o nospace
[[ $COMPREPLY = */ ]] && _do_comp -o nospace
fi
}

Expand All @@ -283,7 +292,7 @@ _ipfs_files_rm()
_ipfs_files_complete
else
COMPREPLY=( / )
[[ $COMPREPLY = */ ]] && compopt -o nospace
[[ $COMPREPLY = */ ]] && _do_comp -o nospace
fi
}
_ipfs_files_flush()
Expand All @@ -292,7 +301,7 @@ _ipfs_files_flush()
_ipfs_files_complete
else
COMPREPLY=( / )
[[ $COMPREPLY = */ ]] && compopt -o nospace
[[ $COMPREPLY = */ ]] && _do_comp -o nospace
fi
}

Expand All @@ -306,7 +315,7 @@ _ipfs_files_read()
_ipfs_files_complete
else
COMPREPLY=( / )
[[ $COMPREPLY = */ ]] && compopt -o nospace
[[ $COMPREPLY = */ ]] && _do_comp -o nospace
fi
}

Expand All @@ -322,7 +331,7 @@ _ipfs_files_write()
_ipfs_files_complete
else
COMPREPLY=( / )
[[ $COMPREPLY = */ ]] && compopt -o nospace
[[ $COMPREPLY = */ ]] && _do_comp -o nospace
fi
}

Expand All @@ -332,7 +341,7 @@ _ipfs_files_cp()
_ipfs_files_complete
else
COMPREPLY=( / )
[[ $COMPREPLY = */ ]] && compopt -o nospace
[[ $COMPREPLY = */ ]] && _do_comp -o nospace
fi
}

Expand All @@ -346,7 +355,7 @@ _ipfs_files_ls()
_ipfs_files_complete
else
COMPREPLY=( / )
[[ $COMPREPLY = */ ]] && compopt -o nospace
[[ $COMPREPLY = */ ]] && _do_comp -o nospace
fi
}

Expand All @@ -361,7 +370,7 @@ _ipfs_files_mkdir()
_ipfs_files_complete
else
COMPREPLY=( / )
[[ $COMPREPLY = */ ]] && compopt -o nospace
[[ $COMPREPLY = */ ]] && _do_comp -o nospace
fi
}

Expand All @@ -373,7 +382,7 @@ _ipfs_files_stat()
_ipfs_files_complete
else
COMPREPLY=( / )
[[ $COMPREPLY = */ ]] && compopt -o nospace
[[ $COMPREPLY = */ ]] && _do_comp -o nospace
fi
}

Expand All @@ -394,7 +403,7 @@ _ipfs_file_ls()
_ipfs_get()
{
if [ "${prev}" == "--output" ] ; then
compopt -o default # Re-enable default file read
_do_comp -o default # Re-enable default file read
COMPREPLY=()
elif [ "${prev}" == "--compression-level" ] ; then
_ipfs_comp "-1 1 2 3 4 5 6 7 8 9" # TODO: Solve autocomplete bug for "="
Expand Down Expand Up @@ -700,7 +709,7 @@ _ipfs_resolve()
else
opts="/ipns/ /ipfs/"
COMPREPLY=( $(compgen -W "${opts}" -- ${word}) )
[[ $COMPREPLY = */ ]] && compopt -o nospace
[[ $COMPREPLY = */ ]] && _do_comp -o nospace
fi
}

Expand Down Expand Up @@ -751,7 +760,7 @@ _ipfs_swarm_disconnect()
opts=$(for x in `ipfs swarm peers`; do echo ${x} ; done)
IFS="$OLDIFS" # Reset divider to space, ' '
COMPREPLY=( $(compgen -W "${opts}" -- ${word}) )
[[ $COMPREPLY = */ ]] && compopt -o nospace -o filenames
[[ $COMPREPLY = */ ]] && _do_comp -o nospace -o filenames
}

_ipfs_swarm_filters()
Expand Down Expand Up @@ -855,7 +864,7 @@ _ipfs_hash_complete()
echo "Current: ${word}" >> ~/Downloads/debug-ipfs.txt
COMPREPLY=( $(compgen -W "${opts}" -- ${word}) )
echo "Suggestion: ${COMPREPLY}" >> ~/Downloads/debug-ipfs.txt
[[ $COMPREPLY = */ ]] && compopt -o nospace -o filenames # Removing whitespace after output & handle output as filenames. (Only printing the latest folder of files.)
[[ $COMPREPLY = */ ]] && _do_comp -o nospace -o filenames # Removing whitespace after output & handle output as filenames. (Only printing the latest folder of files.)
return 0
}

Expand All @@ -866,7 +875,7 @@ _ipfs_files_complete()
opts=$(for x in `ipfs files ls ${lastDir}`; do echo ${lastDir}${x}/ ; done) # TODO: Implement "ipfs files ls -F" to get rid of frontslash after files. This does currently throw "Error: /cats/foo/ is not a directory"
IFS="$OLDIFS" # Reset divider to space, ' '
COMPREPLY=( $(compgen -W "${opts}" -- ${word}) )
[[ $COMPREPLY = */ ]] && compopt -o nospace -o filenames
[[ $COMPREPLY = */ ]] && _do_comp -o nospace -o filenames
return 0
}

Expand Down Expand Up @@ -901,7 +910,7 @@ _ipfs_multiaddr_complete()
opts="/ip4/ /ip6/"
COMPREPLY=( $(compgen -W "${opts}" -- ${word}) )
fi
[[ $COMPREPLY = */ ]] && compopt -o nospace -o filenames
[[ $COMPREPLY = */ ]] && _do_comp -o nospace -o filenames
return 0
}

Expand All @@ -913,19 +922,19 @@ _ipfs_pinned_complete()
IFS="$OLDIFS"
if [[ ${#COMPREPLY[*]} -eq 1 ]]; then # Only one completion, remove pretty output
COMPREPLY=( ${COMPREPLY[0]/ *//} ) #Remove ' ' and everything after
[[ $COMPREPLY = */ ]] && compopt -o nospace # Removing whitespace after output
[[ $COMPREPLY = */ ]] && _do_comp -o nospace # Removing whitespace after output
fi
}
_ipfs_filesystem_complete()
{
compopt -o default # Re-enable default file read
_do_comp -o default # Re-enable default file read
COMPREPLY=()
}

_ipfs()
{
COMPREPLY=()
compopt +o default # Disable default to not deny completion, see: http://stackoverflow.com/a/19062943/1216348
_do_comp +o default # Disable default to not deny completion, see: http://stackoverflow.com/a/19062943/1216348

local word="${COMP_WORDS[COMP_CWORD]}"
local prev="${COMP_WORDS[COMP_CWORD-1]}"
Expand Down