diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2022-01-01 02:26:11 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2022-01-01 02:26:11 -0600 |
| commit | 49edbf438ed690c76e6b2af80368c59404cf0167 (patch) | |
| tree | 129b3adb2f5f39a1329a426a3b7d51ed2c2290c1 /plugins/ant | |
| parent | 1bc186dabe12b3d01b2257e82f3a104c48b8b3c7 (diff) | |
| parent | 78c91ccbf99c77bd4d9cdb74279a40776721f66d (diff) | |
| download | zsh-49edbf438ed690c76e6b2af80368c59404cf0167.tar.gz zsh-49edbf438ed690c76e6b2af80368c59404cf0167.tar.bz2 zsh-49edbf438ed690c76e6b2af80368c59404cf0167.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins/ant')
| -rw-r--r-- | plugins/ant/README.md | 4 | ||||
| -rw-r--r-- | plugins/ant/_ant | 22 | ||||
| -rw-r--r-- | plugins/ant/ant.plugin.zsh | 18 |
3 files changed, 26 insertions, 18 deletions
diff --git a/plugins/ant/README.md b/plugins/ant/README.md index 5f88984ac..571237223 100644 --- a/plugins/ant/README.md +++ b/plugins/ant/README.md @@ -2,9 +2,9 @@ This plugin provides completion for [Ant](https://ant.apache.org/). -To use it add ant to the plugins array in your zshrc file. +To use it, add `ant` to the plugins array in your zshrc file: -```bash +```zsh plugins=(... ant) ``` diff --git a/plugins/ant/_ant b/plugins/ant/_ant new file mode 100644 index 000000000..24a8e3667 --- /dev/null +++ b/plugins/ant/_ant @@ -0,0 +1,22 @@ +#compdef ant + +_ant_does_target_list_need_generating () { + [[ ! -f .ant_targets ]] && return 0 + [[ build.xml -nt .ant_targets ]] && return 0 + return 1 +} + +_ant () { + if [[ ! -f build.xml ]]; then + return + fi + + if ! _ant_does_target_list_need_generating; then + return + fi + + ant -p | awk -F " " 'NR > 5 { print lastTarget } { lastTarget = $1 }' >| .ant_targets + compadd -- "$(cat .ant_targets)" +} + +_ant "$@" diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh index 0b738c94f..5f6382521 100644 --- a/plugins/ant/ant.plugin.zsh +++ b/plugins/ant/ant.plugin.zsh @@ -1,16 +1,2 @@ -_ant_does_target_list_need_generating () { - [ ! -f .ant_targets ] && return 0; - [ build.xml -nt .ant_targets ] && return 0; - return 1; -} - -_ant () { - if [ -f build.xml ]; then - if _ant_does_target_list_need_generating; then - ant -p | awk -F " " 'NR > 5 { print lastTarget }{lastTarget = $1}' > .ant_targets - fi - compadd -- `cat .ant_targets` - fi -} - -compdef _ant ant +# Default to colored output +export ANT_ARGS='-logger org.apache.tools.ant.listener.AnsiColorLogger' |