From 3242ce340621839d03ecf34bb3ed20d7c6f3cbb3 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Mon, 9 Sep 2024 00:35:16 +0900 Subject: [PATCH] app: treat display server variable unset as fatal This is yet another remnant of Ego, as Ego unconditionally shares these resources and the absence of them are ignored and warned about in verbose logging. In our case they are individually opt-in so silently dropping them while the enablement is still set makes very little sense. Signed-off-by: Ophestra Umiker --- internal/app/wayland.go | 4 +--- internal/app/x.go | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/internal/app/wayland.go b/internal/app/wayland.go index 1cabdbd..3b0be85 100644 --- a/internal/app/wayland.go +++ b/internal/app/wayland.go @@ -20,9 +20,7 @@ func (a *App) ShareWayland() { // ensure Wayland socket ACL (e.g. `/run/user/%d/wayland-%d`) if w, ok := os.LookupEnv(waylandDisplay); !ok { - if system.V.Verbose { - fmt.Println("Wayland: WAYLAND_DISPLAY not set, skipping") - } + state.Fatal("Wayland: WAYLAND_DISPLAY not set") } else { // add environment variable for new process wp := path.Join(system.V.Runtime, w) diff --git a/internal/app/x.go b/internal/app/x.go index 02c40a6..414870b 100644 --- a/internal/app/x.go +++ b/internal/app/x.go @@ -16,9 +16,7 @@ func (a *App) ShareX() { // discovery X11 and grant user permission via the `ChangeHosts` command if d, ok := os.LookupEnv(display); !ok { - if system.V.Verbose { - fmt.Println("X11: DISPLAY not set, skipping") - } + state.Fatal("X11: DISPLAY not set") } else { // add environment variable for new process a.AppendEnv(display, d)