811f1f9eb93c9a8a8c554e0ecd0d7ccb377b5919
- Author
- Robby Russell <robby@planetargon.com>
- Committer
- Robby Russell <robby@planetargon.com>
- Date
Message
Merge pull request #3329 from capeterson/master
Improved ant completion
Diff
1diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
2index 45f2b06eb600511408934471ca4320f2497ab218..0b738c94fc8ff1f0f1683fc7684c6b042100ff7a 100644
3--- a/plugins/ant/ant.plugin.zsh
4+++ b/plugins/ant/ant.plugin.zsh
5@@ -1,15 +1,15 @@
6 _ant_does_target_list_need_generating () {
7 [ ! -f .ant_targets ] && return 0;
8- [ .ant_targets -nt build.xml ] && return 0;
9+ [ build.xml -nt .ant_targets ] && return 0;
10 return 1;
11 }
12
13 _ant () {
14 if [ -f build.xml ]; then
15 if _ant_does_target_list_need_generating; then
16- sed -n '/<target/s/<target.*name="\([^"]*\).*$/\1/p' build.xml > .ant_targets
17+ ant -p | awk -F " " 'NR > 5 { print lastTarget }{lastTarget = $1}' > .ant_targets
18 fi
19- compadd `cat .ant_targets`
20+ compadd -- `cat .ant_targets`
21 fi
22 }
23