From 32a834d7cc6bdc48e2ec9819d7385ad6ff432dfa Mon Sep 17 00:00:00 2001
From: Juraj Fiala <doctorjellyface@riseup.net>
Date: Wed, 19 Aug 2015 10:05:15 +0200
Subject: [PATCH] Fixed aliases not being added for pacaur when yaourt is
 present.

---
 plugins/archlinux/archlinux.plugin.zsh | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 190d0e9b3..8d89a45d0 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -6,6 +6,18 @@ if [[ -x `command -v yaourt` ]]; then
   upgrade () {
     yaourt -Syu
   }
+elif [[ -x `command -v pacaur` ]]; then
+  upgrade () {
+    pacaur -Syu
+  }
+else
+ upgrade() {
+   sudo pacman -Syu
+ }
+fi
+
+
+if [[ -x `command -v yaourt` ]]; then
   alias yaconf='yaourt -C'        # Fix all configuration files with vimdiff
   # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
   alias yaupg='yaourt -Syua'        # Synchronize with repositories before upgrading packages (AUR packages too) that are out of date on the local system.
@@ -32,11 +44,10 @@ if [[ -x `command -v yaourt` ]]; then
   fi
   alias yainsd='yaourt -S --asdeps'        # Install given package(s) as dependencies of another package
   alias yamir='yaourt -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
-# If no yaourt, look for pacaur, and add useful functions and aliases to it too
-elif [[ -x `command -v pacaur` ]]; then
-  upgrade () {
-    pacaur -Syu
-  }
+fi
+
+# Look for pacaur, and add useful functions and aliases to it too
+if [[ -x `command -v pacaur` ]]; then
   alias paupg='pacaur -Syu'          # Synchronize with repositories before upgrading packages (AUR too) that are out of date on the local system.
   alias paupgd='pacaur -Syu --devel' # Synchronize with repositories before upgrading packages (AUR and devel too) that are out of date on the local system.
   alias paupga='pacaur -u'           # Upgrade all AUR packages
@@ -63,10 +74,6 @@ elif [[ -x `command -v pacaur` ]]; then
   fi
   alias painsd='pacaur -S --asdeps'        # Install given package(s) as dependencies of another package
   alias pamir='pacaur -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
-else
- upgrade() {
-   sudo pacman -Syu
- }
 fi
 
 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips