From a636ada19825722146f1c08733bb6eabf4cbf7c3 Mon Sep 17 00:00:00 2001
From: Natrim <maly@kinet.cz>
Date: Thu, 21 Jun 2012 09:43:28 +0200
Subject: [PATCH] move the aliases a little

---
 plugins/composer/_composer           |  6 +++---
 plugins/composer/_composer.phar      | 21 +++++++++++++++++++++
 plugins/composer/composer.plugin.zsh | 11 ++++++++++-
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 plugins/composer/_composer.phar

diff --git a/plugins/composer/_composer b/plugins/composer/_composer
index d16e88b4a..ccfcfb906 100644
--- a/plugins/composer/_composer
+++ b/plugins/composer/_composer
@@ -1,9 +1,9 @@
-#compdef composer.phar
+#compdef composer
 #autoload
 
 local -a _1st_arguments
 
-_1st_arguments=(`composer.phar --no-ansi | sed "1,/Available commands/d" | awk '{ printf $1":"; for (i = 2; i <= NF; i++) printf "%s\xc2\xa0",$i; printf "\n" }'`)
+_1st_arguments=(`composer --no-ansi | sed "1,/Available commands/d" | awk '{ printf $1":"; for (i = 2; i <= NF; i++) printf "%s\xc2\xa0",$i; printf "\n" }'`)
 
 _arguments \
  '(--help)--help[Display help message.]' \
@@ -16,6 +16,6 @@ _arguments \
  '*:: :->subcmds' && return 0
 
 if (( CURRENT == 1 )); then
-  _describe -t commands "composer.phar subcommand" _1st_arguments
+  _describe -t commands "composer subcommand" _1st_arguments
   return
 fi
diff --git a/plugins/composer/_composer.phar b/plugins/composer/_composer.phar
new file mode 100644
index 000000000..d16e88b4a
--- /dev/null
+++ b/plugins/composer/_composer.phar
@@ -0,0 +1,21 @@
+#compdef composer.phar
+#autoload
+
+local -a _1st_arguments
+
+_1st_arguments=(`composer.phar --no-ansi | sed "1,/Available commands/d" | awk '{ printf $1":"; for (i = 2; i <= NF; i++) printf "%s\xc2\xa0",$i; printf "\n" }'`)
+
+_arguments \
+ '(--help)--help[Display help message.]' \
+ '(--quiet)--quiet[Do not output any message.]' \
+ '(--verbose)--verbose[Increase verbosity of messages.]' \
+ '(--version)--version[Display this application version.]' \
+ '(--ansi)--ansi[Force ANSI output.]' \
+ '(--no-ansi)--no-ansi[Disable ANSI output.]' \
+ '(--no-interaction)--no-interaction[Do not ask any interactive question.]' \
+ '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "composer.phar subcommand" _1st_arguments
+  return
+fi
diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 983a24754..5e655d4b8 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -1,2 +1,11 @@
 #alias
-alias composer="composer.phar"
\ No newline at end of file
+if which composer.phar &> /dev/null; then
+    if which composer &> /dev/null; then
+    else
+	alias composer="composer.phar"
+    fi
+else
+    if which composer &> /dev/null; then
+	alias composer.phar="composer"
+    fi    
+fi