diff options
author | Ville Skyttä <ville.skytta@iki.fi> | 2010-01-19 23:14:46 +0200 |
---|---|---|
committer | Ville Skyttä <ville.skytta@iki.fi> | 2010-01-19 23:14:46 +0200 |
commit | e24fc84c8daa7288017a0e2403970235d0a4bc60 (patch) | |
tree | da53c08aab654c04c77b9f1af0f2b0960df6c951 | |
parent | 7e03431ed77575d5cb13f4355a54f8cf3d66e015 (diff) | |
download | bash-completion-e24fc84c8daa7288017a0e2403970235d0a4bc60.tar.gz |
Recognize long equivalents to -f and -C when looking for Makefile or dir option.
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | contrib/make | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -25,8 +25,8 @@ bash-completion (2.x) * Apply cardctl completion to pccardctl too. * Apply pine completion to alpine too. * Remove many unnecessary short option completions where long ones exist. - * Improve chsh, configure, cvs, gkrellm, gzip, lftp, look, mdadm, modprobe, - mplayer, mysqladmin, rsync, screen, service, scp, ssh, sshfs, + * Improve chsh, configure, cvs, gkrellm, gzip, lftp, look, make, mdadm, + modprobe, mplayer, mysqladmin, rsync, screen, service, scp, ssh, sshfs, update-alternatives, vncviewer, yp-tools, and general hostname completions. * Add abook and wtf completion, based on work by Raphaël Droz. * Add cvsps, dragon, fusermount, jarsigner, k3b, lftpget, pm-utils, rtcwake, diff --git a/contrib/make b/contrib/make index 0fdb3897..79f373fe 100644 --- a/contrib/make +++ b/contrib/make @@ -39,9 +39,9 @@ _make() --warn-undefined-variables' -- "$cur" ) ) else # before we check for makefiles, see if a path was specified - # with -C + # with -C/--directory for (( i=0; i < ${#COMP_WORDS[@]}; i++ )); do - if [[ ${COMP_WORDS[i]} == -C ]]; then + if [[ ${COMP_WORDS[i]} == -@(C|-directory) ]]; then # eval for tilde expansion eval makef_dir=${COMP_WORDS[i+1]} break @@ -49,9 +49,9 @@ _make() done # before we scan for targets, see if a Makefile name was - # specified with -f + # specified with -f/--file/--makefile for (( i=0; i < ${#COMP_WORDS[@]}; i++ )); do - if [[ ${COMP_WORDS[i]} == -f ]]; then + if [[ ${COMP_WORDS[i]} == -@(f|-?(make)file) ]]; then # eval for tilde expansion eval makef=${COMP_WORDS[i+1]} break |