From 88c191665cfd23e4e37f3b385243b0e6185aebd4 Mon Sep 17 00:00:00 2001
From: Joseph Groocock <frebib@gmail.com>
Date: Sat, 2 Apr 2016 18:19:14 +0100
Subject: [PATCH] Switch from pacaur to yaourt, again

---
 .config/i3blocks/blocks/updates |  2 +-
 .config/pacaur/config           | 10 ----------
 aliases                         |  2 +-
 packages                        |  4 +---
 scripts/install-pacaur          | 25 -------------------------
 scripts/install-yaourt          | 21 +++++++++++++++++++++
 6 files changed, 24 insertions(+), 40 deletions(-)
 delete mode 100644 .config/pacaur/config
 delete mode 100755 scripts/install-pacaur
 create mode 100755 scripts/install-yaourt

diff --git a/.config/i3blocks/blocks/updates b/.config/i3blocks/blocks/updates
index 2f58109..0e06ade 100755
--- a/.config/i3blocks/blocks/updates
+++ b/.config/i3blocks/blocks/updates
@@ -5,7 +5,7 @@ import os
 
 button = os.environ.get('BLOCK_BUTTON')
 if button == '1':
-  os.system("i3-sensible-terminal -e 'pacaur -Syu'")
+  os.system("i3-sensible-terminal -e 'yaourt -Syua'")
 
 updates = commands.getstatusoutput("/usr/bin/checkupdates | wc -l")[1]
 if updates and updates != '0':
diff --git a/.config/pacaur/config b/.config/pacaur/config
deleted file mode 100644
index 11a7b51..0000000
--- a/.config/pacaur/config
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-displaybuildfiles=none                # display build files (none|diff|full)
-sudoloop=false                        # prevent sudo timeout
-
-#editor="${EDITOR:-vi}"                # build files editor
-#fallback=true                         # pacman fallback to the AUR
-#silent=false                          # silence output
-#sortby=popularity                     # sort method (name|votes|popularity)
-#sortorder=descending                  # sort order (ascending|descending)
diff --git a/aliases b/aliases
index 8ab0bf8..012622b 100644
--- a/aliases
+++ b/aliases
@@ -35,7 +35,7 @@ alias cp="rsync -poghb --backup-dir=/tmp/rsync -e /dev/null --progress --"
 
 # System aliases
 alias s=systemd
-alias p=pacaur
+alias y=yaourt
 alias ps='ps aux'
 
 # File default aliases
diff --git a/packages b/packages
index 1940759..23627fe 100644
--- a/packages
+++ b/packages
@@ -8,7 +8,6 @@ btrfs-progs
 clang
 cmake
 compton
-cower
 cowsay
 dosfstools
 dropbox
@@ -16,7 +15,6 @@ dunst
 efibootmgr
 eog
 evince
-expac
 feh
 firefox
 gdmap
@@ -53,7 +51,6 @@ ntfs-3g
 nvidia
 oh-my-zsh-git
 openssh
-pacaur
 pavucontrol
 powertop
 powerline-fonts-git
@@ -84,5 +81,6 @@ xorg-xev
 xorg-xinit
 xorg-xrdb
 xtitle
+yaourt
 zsh
 zsh-syntax-highlighting
diff --git a/scripts/install-pacaur b/scripts/install-pacaur
deleted file mode 100755
index 438922e..0000000
--- a/scripts/install-pacaur
+++ /dev/null
@@ -1,25 +0,0 @@
-if [[ $EUID -eq 0 ]]; then
-    echo "You cannot run makepkg as root."
-    echo "Please run this script again as a non-elevated user"
-    exit 1
-fi
-
-# Install dependencies
-sudo pacman -S --asdeps git curl yajl gnupg
-
-mkdir cower && cd cower
-
-# Get PGP keys so it builds
-gpg --recv-keys --keyserver hkp://pgp.mit.edu 1EB2638FF56C0C53
-
-# Fetch, build and install cower
-curl https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=cower > PKGBUILD 
-makepkg -sri
-
-# Fetch, build and install pacaur
-cd .. && mkdir pacaur && cd pacaur
-curl https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=pacaur > PKGBUILD 
-makepkg -sri
-
-cd ..
-rm -rf cower pacaur
diff --git a/scripts/install-yaourt b/scripts/install-yaourt
new file mode 100755
index 0000000..8546abc
--- /dev/null
+++ b/scripts/install-yaourt
@@ -0,0 +1,21 @@
+if [[ $EUID -eq 0 ]]; then
+    echo "You cannot run makepkg as root."
+    echo "Please run this script again as a non-elevated user"
+    exit 1
+fi
+
+# Install git dependency
+sudo pacman -S --asdeps git
+
+cd /tmp
+git clone https://aur.archlinux.org/package-query.git
+cd package-query
+makepkg -sri
+
+cd ..
+git clone https://aur.archlinux.org/yaourt.git
+cd yaourt
+makepkg -sri
+
+cd ..
+rm -rf package-query yaourt