From 1eb75706269c01f91823d2c1bb8b4d664b70c73e Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Sun, 16 Oct 2022 01:26:57 +0200
Subject: [PATCH] Arrange update menu

---
 updates/menu | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/updates/menu b/updates/menu
index f7ff590..f2bb9b6 100644
--- a/updates/menu
+++ b/updates/menu
@@ -2,11 +2,6 @@
 . ./lib
 
 options=()
-if [ ! -f /usr/bin/pacdiff ]; then
-  options+=("Install pacman-contrib" "")
-  options+=("" "")
-fi
-
 if [ -f /usr/bin/trizen ]; then
   options+=("Upgrade with trizen" "trizen -Syu")
   aurhelper=1
@@ -20,13 +15,6 @@ if [ -f /usr/bin/aurman ]; then
   aurhelper=1
 fi
 
-if [ ! "$aurhelper" = "1" ]; then
-  options+=("Install trizen" "")
-  options+=("Install yay" "")
-  options+=("Install aurman" "")
-  options+=("Install yaourt" "(End of life)")
-  options+=("" "")
-fi
 options+=("Upgrade" "pacman -Syu")
 options+=("Clean orphan" "pacman -Rns \$(pacman -Qqtd)")
 options+=("Clean cache" "pacman -Sc")
@@ -42,24 +30,30 @@ if [ -f /var/lib/pacman/db.lck ]; then
   options+=("Remove db.lck" "rm /var/lib/pacman/db.lck")
   options+=("" "")
 fi
+if [ ! -f /usr/bin/trizen ]; then
+  options+=("Install trizen" "")
+fi
+if [ ! -f /usr/bin/yay ]; then
+  options+=("Install yay" "")
+fi
+if [ ! -f /usr/bin/aurman ]; then
+  options+=("Install aurman" "")
+fi
+options+=("" "")
+if [ ! -f /usr/bin/pacdiff ]; then
+  options+=("Install pacman-contrib" "")
+  options+=("" "")
+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" "(AUR)")
   fi
-  if [ ! -f /usr/bin/trizen ]; then
-    options+=("Install trizen" "")
-  fi
-  if [ ! -f /usr/bin/yay ]; then
-    options+=("Install yay" "")
-  fi
-  if [ ! -f /usr/bin/aurman ]; then
-    options+=("Install aurman" "")
+  if [ ! -f /usr/bin/downgrade ]; then
+    options+=("" "")
+    options+=("Install downgrade" "")
   fi
 fi