[eos-update-notifier] small code cleanup

endeavouros-team · Oct 14, 2023 · 5ce0dbf · 5ce0dbf
1 parent 00691df
commit 5ce0dbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/eos-update-notifier/PKGBUILD b/eos-update-notifier/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=eos-update-notifier
 pkgdesc="Software update notifier and 'news for you' for EndeavourOS users."
 pkgver=23
-pkgrel=16
+pkgrel=17
 arch=('any')
 license=('GPL')
 depends=(eos-bash-shared pacman-contrib xdg-utils libnotify)
@@ -37,7 +37,7 @@ source=(
 sha512sums=('5d7e2312bf93226f240a8e7c2970e88c01acf370d4c77ab088b8ec6b0be9a4fb7e85bf5ae70a591878257951794757edc394cd70f3dfaa61e578ba8f60a26806'
             '8873c225c650f272221e8057b28bb6bd917e6da1e97baa79eafe42e8f1e7efb485dc094d66cba55fe4cc7421a556048e0ae171371766d36d7dfe8add79ac6e3d'
             'd046e675f98a52b9c310e970c5a0b0bc92b08b60d55b9d39140516977e8a6ceb4b3f9d9b05d12fce377b5744f4563e5e66a86ceecafb57f5bd486f968dc57234'
-            '27acf7725d0e760b9dbc9d96e7dabf64339214163615155ae4fe2b4999c741e15590fc708866d830c584e321d7298d0ed5d0566adb6791c09c743289dbbebd6a'
+            '76c99cf430236325e12f7633d85bc3a1055dc2c5d23619c494cf98c447b7beb5da7d71870cef68f1caa39db713e22221f8fdd75b05bdda5adc90fa29136b7445'
             'd5d4d92a9fd0d7a4425bb7000d208d717846ff30c2c31abac94c88840d3e8edc4862a6aacbb576330ff9d7644e63cf90e509caad629d9ed516f378e62b26e168'
             '4c0debbea2fdbfbd86725494bdd5433adb1d3c586168e3cb24b9823501ccc25cdc594854963fb248b5c43a7449a2d348b067791adcea395879a47f3d5ff557f5'
             'c33d879c3a0dd3309e633b15f6bde41543317131a2ab15b077f97f7532e88e2afb426ebd299e5d3309b6677e4fdea93b2452548c9904f219d5a5d43e87586157'

diff --git a/eos-update-notifier/eos-update-notifier-configure b/eos-update-notifier/eos-update-notifier-configure
@@ -15,24 +15,6 @@ GetLibCode() {
     AssignIconVariables_in_eos_bash_shared
 }
 
-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
-            return
-        fi
-    done
-    DIE "suitable editor not found"
-}
-
 ServiceAction() {
     local action="$1"
     case "$action" in
@@ -61,7 +43,7 @@ Main()
     [ "$progname" = "${TARGET_PROG}-configure" ] || DIE "internal problem with program name"
 
     GetLibCode
-    GetSudoEditor
+    Editor="$(EosSudoEditor)"
 
     local cmd=(
         eos_yad