From 8bdae74ebe172239573bab9fca634cf350cbd29d Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Mon, 16 Sep 2024 20:31:15 +0900 Subject: 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 --- internal/util/std.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'internal/util/std.go') diff --git a/internal/util/std.go b/internal/util/std.go index 4f304fb6..9709cc22 100644 --- a/internal/util/std.go +++ b/internal/util/std.go @@ -3,11 +3,10 @@ package util import ( "errors" "fmt" + "git.ophivana.moe/cat/fortify/internal/final" "io/fs" "os" "path" - - "git.ophivana.moe/cat/fortify/internal/state" ) const ( @@ -43,7 +42,7 @@ func DiscoverPulseCookie() string { p = path.Join(p, ".pulse-cookie") if s, err := os.Stat(p); err != nil { if !errors.Is(err, fs.ErrNotExist) { - state.Fatal("Error accessing PulseAudio cookie:", err) + final.Fatal("Error accessing PulseAudio cookie:", err) // unreachable return p } @@ -56,7 +55,7 @@ func DiscoverPulseCookie() string { p = path.Join(p, "pulse", "cookie") if s, err := os.Stat(p); err != nil { if !errors.Is(err, fs.ErrNotExist) { - state.Fatal("Error accessing PulseAudio cookie:", err) + final.Fatal("Error accessing PulseAudio cookie:", err) // unreachable return p } @@ -65,7 +64,7 @@ func DiscoverPulseCookie() string { } } - state.Fatal(fmt.Sprintf("Cannot locate PulseAudio cookie (tried $%s, $%s/pulse/cookie, $%s/.pulse-cookie)", + final.Fatal(fmt.Sprintf("Cannot locate PulseAudio cookie (tried $%s, $%s/pulse/cookie, $%s/.pulse-cookie)", PulseCookie, xdgConfigHome, home)) return "" } -- cgit v1.3.1