diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2016-08-30 14:43:33 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2016-08-30 14:51:41 +1200 |
| commit | 95c3c2daf1e63f02a37db0e003f01da788acfb7d (patch) | |
| tree | 8d477a9d48f58b8100b34892478bdce619db4ee4 /bash/bash_completion.d/eds.bash | |
| parent | Note broken mysql() (diff) | |
| download | dotfiles-95c3c2daf1e63f02a37db0e003f01da788acfb7d.tar.gz dotfiles-95c3c2daf1e63f02a37db0e003f01da788acfb7d.zip | |
Handle empty filename completions better
Bash 4.4 hangs in an awkward way (probably outputting the literal null
char in some unexpected context) without this; I'm not sure if this is a
bug or whether it's just been tolerated behaviour until now.
Diffstat (limited to 'bash/bash_completion.d/eds.bash')
| -rw-r--r-- | bash/bash_completion.d/eds.bash | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/bash/bash_completion.d/eds.bash b/bash/bash_completion.d/eds.bash index 0395fd4c..3829e157 100644 --- a/bash/bash_completion.d/eds.bash +++ b/bash/bash_completion.d/eds.bash @@ -5,6 +5,7 @@ _eds() { edspath=${EDSPATH:-"$HOME"/.local/bin} [[ -d $edspath ]] || return while IFS= read -rd '' executable ; do + [[ -n $executable ]] || continue COMPREPLY[${#COMPREPLY[@]}]=$executable done < <( shopt -s dotglob nullglob @@ -15,8 +16,15 @@ _eds() { [[ -f $file && -x $file ]] || continue executables[${#executables[@]}]=${file##*/} done - ((${#executables[@]})) || exit 1 - printf '%q\0' "${executables[@]}" + + # Print quoted entries, null-delimited, if there was at least one; + # otherwise, just print a null character to stop this hanging in Bash + # 4.4 + if ((${#executables[@]})) ; then + printf '%q\0' "${executables[@]}" + else + printf '\0' + fi ) } complete -F _eds eds |