From cab970b01560fbc2398ee44eee4c349370c75c94 Mon Sep 17 00:00:00 2001 From: devangpratap <115096812+devangpratap@users.noreply.github.com> Date: Fri, 30 Oct 2026 22:34:06 -0400 Subject: [PATCH] desktop-ui: Use the kitten path fallback when os.Executable fails enable_portal checked eerr instead of err after filepath.Abs, so a failing os.Executable always aborted with a nil error and the Which fallback was never used, while an Abs error was ignored. Check err, and report the os.Executable error if kitten is not in PATH either. --- kittens/desktop_ui/portal.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kittens/desktop_ui/portal.go b/kittens/desktop_ui/portal.go index 518274ac0..7229a6c8c 100644 --- a/kittens/desktop_ui/portal.go +++ b/kittens/desktop_ui/portal.go @@ -434,9 +434,11 @@ Interfaces=%s; dbus_service_defn := filepath.Join(dbus_service_dir, PORTAL_BUS_NAME+".service") exe_path, eerr := os.Executable() if eerr != nil { - exe_path = utils.Which("kitten") + if exe_path = utils.Which("kitten"); exe_path == "" { + return fmt.Errorf("failed to get path to kitten executable with error: %w", eerr) + } } - if exe_path, err = filepath.Abs(exe_path); eerr != nil { + if exe_path, err = filepath.Abs(exe_path); err != nil { return fmt.Errorf("failed to get path to kitten executable with error: %w", err) } if err = os.WriteFile(dbus_service_defn, utils.UnsafeStringToBytes(fmt.Sprintf(