From 61146b552f1a6bcddf3549fc9a236d76ff280817 Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Sun, 22 Jul 2018 17:25:41 +0200
Subject: [PATCH] Add trizen as default aur helper

---
 config/bash/aliases |  4 ++
 lib                 | 32 ++++++++--------
 updates/menu        | 90 ++++++++++++++++++++++++---------------------
 3 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/config/bash/aliases b/config/bash/aliases
index 4fb00d8..9f698d7 100644
--- a/config/bash/aliases
+++ b/config/bash/aliases
@@ -26,6 +26,9 @@ options+=("vdir" "vdir --color=auto" on)
 options+=("watch" "watch --color" on)
 options+=("man" "color function" on)
 options+=("mkdir" "mkdir -pv" off)
+if [ -f /usr/bin/trizen ]; then
+	options+=("trizen" "sudo -u aurbuilder trizen" on)
+fi
 if [ -f /usr/bin/yaourt ]; then
 	options+=("yaourt" "sudo -u aurbuilder yaourt --color" on)
 	options+=("yaourt(2)" "sudo -u aurbuilder yaourt" off)
@@ -80,6 +83,7 @@ for itm in $sel; do
 			echo '}' >> /etc/profile.d/alias.sh
 		;;
 		'"mkdir"') echo "alias mkdir='mkdir -pv'" >> /etc/profile.d/alias.sh;;
+		'"trizen"') echo "alias trizen='sudo -u aurbuilder trizen'" >> /etc/profile.d/alias.sh;;
 		'"yaourt"') echo "alias yaourt='sudo -u aurbuilder yaourt --color'" >> /etc/profile.d/alias.sh;;
 		'"yaourt(2)"') echo "alias yaourt='sudo -u aurbuilder yaourt'" >> /etc/profile.d/alias.sh;;
 		'"yaourt(3)"') echo "alias yaourt='yaourt --color'" >> /etc/profile.d/alias.sh;;
diff --git a/lib b/lib
index 9e96da6..a06c9ce 100644
--- a/lib
+++ b/lib
@@ -47,22 +47,20 @@ instpkg(){
     pressanykey
   fi
   if [ ! "$2" = "" ]; then
-    if [ -f /usr/bin/yaourt ]; then
+    if [ -f /usr/bin/trizen ]; then
       clear
-      echo "# sudo -u aurbuilder yaourt -S --needed $2"
-      sudo -u aurbuilder yaourt -S --needed $2
+      echo "# sudo -u aurbuilder trizen -S --needed $2"
+      sudo -u aurbuilder trizen -S --needed $2
       pressanykey
     else
-			echo "To install AUR packages, you need to install yaourt or packer in updates menu !"
-      #if [ -f /usr/bin/packer ]; then
-      #  clear
-      #  echo "# sudo -u aurbuilder packer -S $2"
-      #  sudo -u aurbuilder packer -S $2
-      #  pressanykey
-      #else
-      #  clear
-      #  echo "To install AUR packages, you need to install yaourt or packer in updates menu !"
-      #fi
+      if [ -f /usr/bin/yaourt ]; then
+        clear
+        echo "# sudo -u aurbuilder yaourt -S --needed $2"
+        sudo -u aurbuilder yaourt -S --needed $2
+        pressanykey
+      else
+        echo "To install AUR packages, you need to install yaourt or packer in updates menu !"
+      fi
     fi
   fi
 }
@@ -104,11 +102,11 @@ chooseaurpkg(){
     title=$2
   fi
   options=()
-  if [ -f /usr/bin/yaourt ]; then
-    items=$(yaourt -Ssq $1)
+  if [ -f /usr/bin/trizen ]; then
+    items=$(trizen -Ssq $1)
   else
-    if [ -f /usr/bin/packer ]; then
-      items=$(packer -Ssq $1)
+    if [ -f /usr/bin/yaourt ]; then
+      items=$(yaourt -Ssq $1)
     fi
   fi
   for item in $items; do
diff --git a/updates/menu b/updates/menu
index 113ec02..23d2e50 100644
--- a/updates/menu
+++ b/updates/menu
@@ -2,17 +2,17 @@
 . ./lib
 
 options=()
+if [ -f /usr/bin/trizen ]; then
+  options+=("Upgrade with trizen" "trizen -Syu")
+  aurhelper=1
+fi
 if [ -f /usr/bin/yaourt ]; then
   options+=("Upgrade with yaourt" "yaourt -Syua")
   aurhelper=1
 fi
-#if [ -f /usr/bin/packer ]; then
-#  options+=("Upgrade with packer" "packer -Syu")
-#  aurhelper=1
-#fi
 if [ ! "$aurhelper" = "1" ]; then
+  options+=("Install trizen" "")
   options+=("Install yaourt" "")
-#  options+=("Install packer" "")
   options+=("" "")
 fi
 options+=("Upgrade" "pacman -Syu")
@@ -29,22 +29,22 @@ if [ -f /var/lib/pacman/db.lck ]; then
   options+=("Remove db.lck" "rm /var/lib/pacman/db.lck")
   options+=("" "")
 fi
-if [ ! -f /usr/bin/downgrade ]; then
-  options+=("Install downgrade" "")
-fi
 if [ "$aurhelper" = "1" ]; then
+  if [ ! -f /usr/bin/downgrade ]; then
+    options+=("Install downgrade" "")
+  fi
   if [ ! -f /usr/bin/pkgstats ]; then
     options+=("Install pkgstats" "")
   fi
   if [ ! -f /usr/bin/aurvote ]; then
     options+=("Install aurvote" "")
   fi
+  if [ ! -f /usr/bin/trizen ]; then
+    options+=("Install trizen" "")
+  fi
   if [ ! -f /usr/bin/yaourt ]; then
     options+=("Install yaourt" "")
   fi
-  #if [ ! -f /usr/bin/packer ]; then
-  #  options+=("Install packer" "")
-  #fi
 fi
 
 sel=$(whiptail --backtitle "$apptitle" --title "Updates Menu :" --menu "" --cancel-button "Back" 0 0 0 \
@@ -63,21 +63,25 @@ checkaurdependencies(){
   fi
   if [ ! $(id -u "aurbuilder") ]; then
     newpass=$(< /dev/urandom tr -dc "@#*%&_A-Z-a-z-0-9" | head -c16)
-    useradd -r -N -M -d /home/.aurbuilder -s /usr/bin/nologin aurbuilder
+    useradd -r -N -M -d /tmp/aurbuilder -s /usr/bin/nologin aurbuilder
     echo -e "$newpass\n$newpass\n"|passwd aurbuilder
     newpass=""
+  else
+    usermod -m -d /tmp/aurbuilder aurbuilder
   fi
   if [ ! -f /etc/sudoers.d/aurbuilder ]; then
     echo "aurbuilder ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/aurbuilder
     echo "root ALL=(aurbuilder) NOPASSWD: ALL" >> /etc/sudoers.d/aurbuilder
   fi
+}
+checkpackagequerydependencies(){
   if [ ! -f /usr/bin/package-query ]; then
-		mkdir /tmp/aurbuilder
-		chmod	777 /tmp/aurbuilder
-		cd /tmp/aurbuilder
-		sudo -u aurbuilder git clone https://aur.archlinux.org/package-query.git
-		cd package-query
-		sudo -u aurbuilder makepkg -si
+    mkdir /tmp/aurbuilder
+    chmod	777 /tmp/aurbuilder
+    cd /tmp/aurbuilder
+    sudo -u aurbuilder git clone https://aur.archlinux.org/package-query.git
+    cd package-query
+    sudo -u aurbuilder makepkg -si
   fi
 }
 checkarchlinuxfrrepo(){
@@ -92,14 +96,14 @@ checkarchlinuxfrrepo(){
 clear
 case $sel in
   'Upgrade') pacman -Syu;;
+  'Upgrade with trizen')
+    checkaurdependencies
+    sudo -u aurbuilder trizen -Syu
+  ;;
   'Upgrade with yaourt')
     checkaurdependencies
     sudo -u aurbuilder yaourt -Syua
   ;;
-  'Upgrade with packer')
-    checkaurdependencies
-    sudo -u aurbuilder packer -Syu
-  ;;
   'Clean orphan') pacman -Rns $(pacman -Qqtd);;
   'Clean cache') pacman -Sc;;
   'Edit pacman.conf') nano /etc/pacman.conf;;
@@ -108,36 +112,38 @@ case $sel in
   'Refresh pacman keys') pacman-key --refresh-keys;;
   'Remove db.lck') rm /var/lib/pacman/db.lck;;
   'Install downgrade')
-    checkarchlinuxfrrepo
-    pacman -S --needed downgrade
+    instpkg "" "downgrade"
+  ;;
+  'Install trizen')
+    if(confirm "Yaourt allow you to access the AUR applications.\nBecause is not possible to compile applications as root,\nthis installer create an aurbuilder user.\n\nInstall trizen ?") then
+      clear
+      checkaurdependencies
+      mkdir /tmp/aurbuilder
+      chmod	777 /tmp/aurbuilder
+      cd /tmp/aurbuilder
+      sudo -u aurbuilder git clone https://aur.archlinux.org/trizen.git
+      cd trizen
+      sudo -u aurbuilder makepkg -si
+    fi
   ;;
   'Install yaourt')
     if(confirm "Yaourt allow you to access the AUR applications.\nBecause is not possible to compile applications as root,\nthis installer create an aurbuilder user.\n\nInstall yaourt ?") then
       clear
       checkaurdependencies
-      #checkarchlinuxfrrepo
-      #pacman -S --needed yaourt
-			mkdir /tmp/aurbuilder
-			chmod	777 /tmp/aurbuilder
-			cd /tmp/aurbuilder
-			sudo -u aurbuilder git clone https://aur.archlinux.org/yaourt.git
-			cd yaourt
-			sudo -u aurbuilder makepkg -si
-    fi
-  ;;
-  'Install packer')
-    if(confirm "Packer allow you to access the AUR applications.\nBecause is not possible to compile applications as root,\nthis installer create an aurbuilder user.\n\nInstall packer ?") then
-      clear
-      checkaurdependencies
-      checkarchlinuxfrrepo
-      pacman -S --needed packer
+      checkpackagequerydependencies
+      mkdir /tmp/aurbuilder
+      chmod	777 /tmp/aurbuilder
+      cd /tmp/aurbuilder
+      sudo -u aurbuilder git clone https://aur.archlinux.org/yaourt.git
+      cd yaourt
+      sudo -u aurbuilder makepkg -si
     fi
   ;;
   'Install pkgstats')
-		pacman -S --needed pkgstats
+    pacman -S --needed pkgstats
   ;;
   'Install aurvote')
-		pacman -S --needed aurvote
+    pacman -S --needed aurvote
   ;;
 esac