From 00691df6a8e4e3253cfe3d8d4ee4a037915c18f2 Mon Sep 17 00:00:00 2001
From: manuel-192 <manuel-192@outlook.com>
Date: Sat, 14 Oct 2023 18:42:19 +0300
Subject: [PATCH] [akm] small code cleanup

---
 akm/PKGBUILD |  4 ++--
 akm/akm      | 27 ++++-----------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/akm/PKGBUILD b/akm/PKGBUILD
index d23e8b61..344ce347 100644
--- a/akm/PKGBUILD
+++ b/akm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=akm
 pkgdesc="Arch kernel manager."
 url=https://github.com/endeavouros-team/PKGBUILDS/tree/master/$pkgname
 _url="https://raw.githubusercontent.com/endeavouros-team/PKGBUILDS/master/$pkgname"
-pkgver=23.3
+pkgver=23.4
 pkgrel=1
 arch=('any')
 license=('GPL')
@@ -17,7 +17,7 @@ source=(
     "$_url/$pkgname.conf"
     "$_url/$pkgname.desktop"
 )
-sha512sums=('0e954491029871c2e7453c630b0272f9ea5a88f5cabc66b0aed4ed1a110eab0fdd2e474ea5b1109e59ebce22ea50a09ac2a17a44d529a934ff54e54910c19aa9'
+sha512sums=('17c59da41d170253c7ecd917e9a6a38e54ce2985550be7e111b8448042867cbcb00e52b5208d9246f15ef0c00e9f8eeb0188d3ee69050858c5a4aa6e3ea711ea'
             '9ab486eaa58857dfaf1d3b3838768b9c629f65709177544ad4602daf2752be9709a529abba359fe984a9f231688ae30bb7aa3df97a2c8d88fbb37742f5fd26f7'
             '3d8e3bddd23cb6871f86070d864decf1dd9fc117ac18d8983217b009d2c5eb04ff0a51745e5e59ba82b4c6cb65f70ac0d0bad031d28777db446d1c27d73d3ac3')
 
diff --git a/akm/akm b/akm/akm
index ece647d7..af9b5ca5 100755
--- a/akm/akm
+++ b/akm/akm
@@ -338,32 +338,13 @@ FindNewRepoLineNumber() {
     echo "$linenr"
 }
 
-GetSudoEditor() {
-    local editor ed1
-
-    for editor in "${EOS_SUDO_EDITORS[@]}" "$SUDO_EDITOR" "$VISUAL" "$EDITOR" nano ; do
-        ed1="$(echo "$editor" | awk '{print $1}')"
-        if (/usr/bin/which "$ed1" >& /dev/null) ; then
-            case "$ed1" in
-                mousepad | /usr/bin/mousepad)
-                    Editor="/usr/bin/dbus-launch $editor" ;;
-                *)
-                    Editor="$editor" ;;
-            esac
-            echo "$Editor"
-            return
-        fi
-    done
-    DIE "suitable editor not found"
-}
-
 PacmanConfEditor() {
     local linenr="$1"
-    local editor="$(GetSudoEditor)"
-    local ed1="$(echo "$editor" | awk '{print $1}')"
+    local editor="$(EosSudoEditor)"
+    local ed1="${editor%% *}"
 
     case "$ed1" in
-        emacs|vim|nano | /usr/bin/emacs|/usr/bin/vim|/usr/bin/nano)
+        emacs|vim|nano|rnano | /usr/bin/emacs|/usr/bin/vim|/usr/bin/nano|/usr/bin/rnano)
             echo "$editor +$linenr"
             ;;
         *)
@@ -484,7 +465,7 @@ Main2() {
     t1+="See file <tt>/etc/akm.conf</tt> for configuration details.\n"
     t1+="$smallEnd"
     local linenr="$(FindNewRepoLineNumber)"
-    local editor="$(PacmanConfEditor $linenr)"
+    # local editor="$(PacmanConfEditor $linenr)"
 
     local cmd=(
         eos_yad