From a24aacba1b04a761aba713520d20b8a04e808a37 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sun, 18 Mar 2018 18:15:27 +0100
Subject: [PATCH] pacaur

---
 arch-graphical-install-auto | 92 ++++++++++++++++++++++---------------
 packages_cinnamon.txt       |  1 +
 packages_gnome.txt          |  1 +
 packages_kde.txt            |  1 +
 packages_libre.txt          |  1 +
 packages_lxde.txt           |  1 +
 packages_lxqt.txt           |  1 +
 packages_mate.txt           |  1 +
 packages_voll.txt           |  1 +
 packages_xfce4.txt          |  1 +
 10 files changed, 64 insertions(+), 37 deletions(-)

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index 44c8518..6323f63 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -44,10 +44,62 @@ function gitclone() {
     cd /
 }
 
+
+function yaourtmanagerinstall() {
+            cd /home/"$username"/
+            pwd
+            su "$username" -c "curl -O https://aur.archlinux.org/cgit/aur.git/snapshot/package-query.tar.gz"
+            pwd
+            su "$username" -c "tar -xvzf package-query.tar.gz"
+            pwd
+            cd package-query
+            pwd
+            su "$username" -c "makepkg -si --skipchecksums --skippgpcheck --nocheck --noconfirm --install --needed" <<EOT
+            pwd
+            cd ..
+            pwd
+            su "$username" -c "curl -O https://aur.archlinux.org/cgit/aur.git/snapshot/yaourt.tar.gz"
+            pwd
+            su "$username" -c "tar -xvzf yaourt.tar.gz"
+            pwd
+            cd yaourt
+            pwd
+            su "$username" -c "makepkg -si --skipchecksums --skippgpcheck --nocheck --noconfirm --install --needed"
+            pwd
+            cd /
+
+}
+
+function pacaurmanagerinstall() {
+
+            cd /home/"$username"/
+            pwd
+            su "$username" -c "git clone https://aur.archlinux.org/cower.git"
+            pwd
+            cd cower
+            pwd
+            su "$username" -c "makepkg -si --skipchecksums --skippgpcheck --nocheck --noconfirm --install --needed"
+            pwd
+            cd ..
+            pwd
+            su "$username" -c "git clone https://aur.archlinux.org/pacaur.git"
+            pwd
+            cd pacaur
+            pwd
+            su "$username" -c "makepkg -si --skipchecksums --skippgpcheck --nocheck --noconfirm --install --needed"
+            pwd
+            cd /
+
+}
+
 function yaourtinstall() {
     su "$username" -c "yaourt -S $1 --needed --noconfirm"
 }
 
+function pacaurinstall() {
+    su "$username" -c "pacaur -S $1 --needed --noconfirm"
+}
+
 function standartinstallation() {
     pacman -Syu $(cat /opt/${repo}/packages_${version}.txt) --needed --noconfirm
 }
@@ -276,43 +328,9 @@ then
 fi
 
 if [ "${version}" != "libre" ]; then
-    if [ "$yaourt" != "n" ]
-    then
-        if [ "$yaourt" != "debug" ]; then
-            cd /home/"$username"/
-            pwd
-            su "$username" -c "curl -O https://aur.archlinux.org/cgit/aur.git/snapshot/package-query.tar.gz"
-            pwd
-            su "$username" -c "tar -xvzf package-query.tar.gz"
-            pwd
-            cd package-query
-            pwd
-            su "$username" -c "makepkg -si" <<EOT
-
-
-EOT
-            pwd
-            cd ..
-            pwd
-            su "$username" -c "curl -O https://aur.archlinux.org/cgit/aur.git/snapshot/yaourt.tar.gz"
-            pwd
-            su "$username" -c "tar -xvzf yaourt.tar.gz"
-            pwd
-            cd yaourt
-            pwd
-            su "$username" -c "makepkg -si" <<EOT
-
-
-EOT
-            pwd
-            cd ..
-            pwd
-            su "$username" -c "mkdir -p /home/"$username"/aur-pakete"
-            pwd
-        fi
-        yaourtinstall pamac-aur
-
-    fi
+  #yaourtmanagerinstall
+  pacaurmanagerinstall
+  yaourtinstall pamac-aur
 fi
 
 
diff --git a/packages_cinnamon.txt b/packages_cinnamon.txt
index 7ccd264..e716e14 100644
--- a/packages_cinnamon.txt
+++ b/packages_cinnamon.txt
@@ -30,6 +30,7 @@ dsniff
 efibootmgr
 efitools
 exfat-utils
+expac
 fail2ban
 ffmpeg
 file-roller
diff --git a/packages_gnome.txt b/packages_gnome.txt
index 4adff75..3b684a6 100644
--- a/packages_gnome.txt
+++ b/packages_gnome.txt
@@ -29,6 +29,7 @@ dsniff
 efibootmgr
 efitools
 exfat-utils
+expac
 fail2ban
 ffmpeg
 file-roller
diff --git a/packages_kde.txt b/packages_kde.txt
index 7eb1690..3545b56 100644
--- a/packages_kde.txt
+++ b/packages_kde.txt
@@ -29,6 +29,7 @@ dsniff
 efibootmgr
 efitools
 exfat-utils
+expac
 fail2ban
 ffmpeg
 file-roller
diff --git a/packages_libre.txt b/packages_libre.txt
index 2758a86..1cbeb53 100644
--- a/packages_libre.txt
+++ b/packages_libre.txt
@@ -22,6 +22,7 @@ efibootmgr
 efitools
 elementary-icon-theme
 exfat-utils
+expac
 fail2ban
 ffmpeg
 filezilla
diff --git a/packages_lxde.txt b/packages_lxde.txt
index edf3c22..55ed680 100644
--- a/packages_lxde.txt
+++ b/packages_lxde.txt
@@ -29,6 +29,7 @@ dsniff
 efibootmgr
 efitools
 exfat-utils
+expac
 fail2ban
 ffmpeg
 file-roller
diff --git a/packages_lxqt.txt b/packages_lxqt.txt
index 746c7ac..89eb030 100644
--- a/packages_lxqt.txt
+++ b/packages_lxqt.txt
@@ -30,6 +30,7 @@ dsniff
 efibootmgr
 efitools
 exfat-utils
+expac
 fail2ban
 ffmpeg
 file-roller
diff --git a/packages_mate.txt b/packages_mate.txt
index b7cc916..7cc242c 100644
--- a/packages_mate.txt
+++ b/packages_mate.txt
@@ -29,6 +29,7 @@ dsniff
 efibootmgr
 efitools
 exfat-utils
+expac
 fail2ban
 ffmpeg
 file-roller
diff --git a/packages_voll.txt b/packages_voll.txt
index 629f3e9..d543d9c 100644
--- a/packages_voll.txt
+++ b/packages_voll.txt
@@ -45,6 +45,7 @@ efibootmgr
 efitools
 elementary-icon-theme
 exfat-utils
+expac
 fail2ban
 ffmpeg
 file-roller
diff --git a/packages_xfce4.txt b/packages_xfce4.txt
index b47fe68..f134eb7 100644
--- a/packages_xfce4.txt
+++ b/packages_xfce4.txt
@@ -29,6 +29,7 @@ dsniff
 efibootmgr
 efitools
 exfat-utils
+expac
 fail2ban
 ffmpeg
 file-roller