From 8bdae74ebe172239573bab9fca634cf350cbd29d Mon Sep 17 00:00:00 2001
From: Ophestra Umiker <cat@ophivana.moe>
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 <cat@ophivana.moe>
---
 internal/system/retrieve.go | 28 ----------------------------
 internal/system/value.go    | 13 -------------
 2 files changed, 41 deletions(-)
 delete mode 100644 internal/system/retrieve.go
 delete mode 100644 internal/system/value.go

(limited to 'internal/system')

diff --git a/internal/system/retrieve.go b/internal/system/retrieve.go
deleted file mode 100644
index 06798423..00000000
--- a/internal/system/retrieve.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package system
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"strconv"
-)
-
-func Retrieve() {
-	if V != nil {
-		panic("system info retrieved twice")
-	}
-
-	v := &Values{Share: path.Join(os.TempDir(), "fortify."+strconv.Itoa(os.Geteuid()))}
-
-	if r, ok := os.LookupEnv(xdgRuntimeDir); !ok {
-		fmt.Println("Env variable", xdgRuntimeDir, "unset")
-
-		// too early for fatal
-		os.Exit(1)
-	} else {
-		v.Runtime = r
-		v.RunDir = path.Join(v.Runtime, "fortify")
-	}
-
-	V = v
-}
diff --git a/internal/system/value.go b/internal/system/value.go
deleted file mode 100644
index c34e7fa8..00000000
--- a/internal/system/value.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package system
-
-const (
-	xdgRuntimeDir = "XDG_RUNTIME_DIR"
-)
-
-type Values struct {
-	Share   string
-	Runtime string
-	RunDir  string
-}
-
-var V *Values
-- 
cgit v1.3.1