final: refactor for removal of system package and reduction of interactions to state package

State query command has been moved to main where it belongs, "system" information are now fetched in app.New and stored in *App with accessors for relevant values. Exit (cleanup-related) functions are separated into its dedicated "final" package.

Signed-off-by: Ophestra Umiker <cat@ophivana.moe>

1 files changed, 5 insertions, 5 deletions

diff --git a/internal/app/wayland.go b/internal/app/wayland.go
index 12568712..9834fea9 100644
--- a/internal/app/wayland.go
+++ b/internal/app/wayland.go
@@ -2,12 +2,12 @@ package app
 
 import (
 	"fmt"
+	"git.ophivana.moe/cat/fortify/internal/final"
 	"os"
 	"path"
 
 	"git.ophivana.moe/cat/fortify/internal/acl"
 	"git.ophivana.moe/cat/fortify/internal/state"
-	"git.ophivana.moe/cat/fortify/internal/system"
 	"git.ophivana.moe/cat/fortify/internal/verbose"
 )
 
@@ -21,15 +21,15 @@ func (a *App) ShareWayland() {
 
 	// ensure Wayland socket ACL (e.g. `/run/user/%d/wayland-%d`)
 	if w, ok := os.LookupEnv(waylandDisplay); !ok {
-		state.Fatal("Wayland: WAYLAND_DISPLAY not set")
+		final.Fatal("Wayland: WAYLAND_DISPLAY not set")
 	} else {
 		// add environment variable for new process
-		wp := path.Join(system.V.Runtime, w)
+		wp := path.Join(a.runtimePath, w)
 		a.AppendEnv(waylandDisplay, wp)
 		if err := acl.UpdatePerm(wp, a.UID(), acl.Read, acl.Write, acl.Execute); err != nil {
-			state.Fatal(fmt.Sprintf("Error preparing Wayland '%s':", w), err)
+			final.Fatal(fmt.Sprintf("Error preparing Wayland '%s':", w), err)
 		} else {
-			state.RegisterRevertPath(wp)
+			final.RegisterRevertPath(wp)
 		}
 		verbose.Printf("Wayland socket '%s' configured\n", w)
 	}