Browse Source

Merge pull request #3329 from capeterson/master

Improved ant completion
Robby Russell 9 years ago
parent
commit
811f1f9eb9
1 changed files with 3 additions and 3 deletions
  1. 3 3
      plugins/ant/ant.plugin.zsh

+ 3 - 3
plugins/ant/ant.plugin.zsh

@@ -1,15 +1,15 @@
 _ant_does_target_list_need_generating () {
 _ant_does_target_list_need_generating () {
   [ ! -f .ant_targets ] && return 0;
   [ ! -f .ant_targets ] && return 0;
-  [ .ant_targets -nt build.xml ] && return 0;
+  [ build.xml -nt .ant_targets ] && return 0;
   return 1;
   return 1;
 }
 }
 
 
 _ant () {
 _ant () {
   if [ -f build.xml ]; then
   if [ -f build.xml ]; then
     if _ant_does_target_list_need_generating; then
     if _ant_does_target_list_need_generating; then
-     sed -n '/<target/s/<target.*name="\([^"]*\).*$/\1/p' build.xml > .ant_targets
+    	ant -p | awk -F " " 'NR > 5 { print lastTarget }{lastTarget = $1}' > .ant_targets
     fi
     fi
-    compadd `cat .ant_targets`
+    compadd -- `cat .ant_targets`
   fi
   fi
 }
 }