6 files changed, 75 insertions, 53 deletions

diff --git a/exit.go b/exit.go
index 364684e..fdaec8a 100644
--- a/exit.go
+++ b/exit.go
@@ -7,7 +7,7 @@ import "os"
 
 // argv normally sets these callbacks
 // argv has timing set from when os.Args was parsed
-func GoodExit(reason string, err error) {
+func GoodExit(reason string) {
 	if goodExit != nil {
 		goodExit(reason)
 	}
@@ -20,3 +20,12 @@ func BadExit(reason string, err error) {
 	}
 	os.Exit(-1)
 }
+
+func Exit(reason string, err error) {
+	if err == nil {
+		GoodExit(reason)
+		os.Exit(0)
+	}
+	BadExit(reason, err)
+	os.Exit(-1)
+}
diff --git a/appname.go b/get.go
index 9fae527..e783b94 100644
--- a/appname.go
+++ b/get.go
@@ -5,6 +5,20 @@ import (
 	"os/user"
 )
 
+func Get(flag string) string {
+	saveMu.Lock()
+	defer saveMu.Unlock()
+	if envPB == nil {
+		return ""
+	}
+	c := findByLower(flag)
+	if c == nil {
+		return ""
+	}
+
+	return c.Value
+}
+
 func GetAppname() (string, error) {
 	if APPNAME != "" {
 		return APPNAME, nil
diff --git a/init.go b/init.go
index e7130c0..2db551c 100644
--- a/init.go
+++ b/init.go
@@ -2,6 +2,7 @@ package env
 
 import (
 	"os"
+	"os/user"
 	"path/filepath"
 	"strings"
 )
@@ -29,9 +30,17 @@ func Init(appname, version, buildtime string, fromargv []string, goodFunc func(s
 	SetGlobal("lib/env", "APPNAME", APPNAME)
 	SetGlobal("lib/env", "VERSION", VERSION)
 	SetGlobal("lib/env", "BUILDTIME", BUILDTIME)
+	usr, err := user.Current()
+	if err == nil {
+		SetGlobal("lib/env", "username", usr.Username)
+	}
+	homeDir, err := os.UserHomeDir()
+	if err == nil {
+		SetGlobal("lib/env", "homeDir", homeDir)
+	}
 }
 
-// if it exists, loads ~/.config/<appname>/<appname>.env
+// if it exists, loads ~/.config/<appname>/<appname>rc
 func loadAppENV() error {
 	saveMu.Lock()
 	saveMu.Unlock()
diff --git a/save.go b/save.go
index 36e20d5..351b665 100644
--- a/save.go
+++ b/save.go
@@ -2,7 +2,6 @@ package env
 
 import (
 	"os"
-	"strings"
 )
 
 // saves your applications config file
@@ -23,53 +22,3 @@ func saveENVnolock(filename string) error {
 	}
 	return os.WriteFile(filename, []byte(outENV), 0644)
 }
-
-func Get(flag string) string {
-	saveMu.Lock()
-	defer saveMu.Unlock()
-	if envPB == nil {
-		return ""
-	}
-	c := findByLower(flag)
-	if c == nil {
-		return ""
-	}
-
-	return c.Value
-}
-
-func True(flag string) bool {
-	saveMu.Lock()
-	defer saveMu.Unlock()
-	if envPB == nil {
-		return false
-	}
-	found := envPB.FindByVar(flag)
-	if found == nil {
-		return false
-	}
-	if strings.ToLower(found.Value) == "true" {
-		return true
-	}
-	return false
-}
-
-func Set(varname string, newValue string) error {
-	saveMu.Lock()
-	defer saveMu.Unlock()
-	if envPB == nil {
-		return NotInitialized
-	}
-	found := envPB.FindByVar(varname)
-	if found != nil {
-		found.Value = newValue
-		saveENVnolock(envPB.Filename)
-	}
-
-	newvar := new(Key)
-	newvar.Var = varname
-	newvar.Value = newValue
-	envPB.Append(newvar)
-	saveENVnolock(envPB.Filename)
-	return nil
-}
diff --git a/SetGlobal.go b/set.go
index 8b19325..fd3e5a0 100644
--- a/SetGlobal.go
+++ b/set.go
@@ -20,3 +20,23 @@ func SetGlobal(global string, varname string, newValue string) error {
 	envPB.Append(newvar)
 	return nil
 }
+
+func Set(varname string, newValue string) error {
+	saveMu.Lock()
+	defer saveMu.Unlock()
+	if envPB == nil {
+		return NotInitialized
+	}
+	found := envPB.FindByVar(varname)
+	if found != nil {
+		found.Value = newValue
+		saveENVnolock(envPB.Filename)
+	}
+
+	newvar := new(Key)
+	newvar.Var = varname
+	newvar.Value = newValue
+	envPB.Append(newvar)
+	saveENVnolock(envPB.Filename)
+	return nil
+}
diff --git a/true.go b/true.go
new file mode 100644
index 0000000..927a77d
--- /dev/null
+++ b/true.go
@@ -0,0 +1,21 @@
+package env
+
+import (
+	"strings"
+)
+
+func True(flag string) bool {
+	saveMu.Lock()
+	defer saveMu.Unlock()
+	if envPB == nil {
+		return false
+	}
+	found := envPB.FindByVar(flag)
+	if found == nil {
+		return false
+	}
+	if strings.ToLower(found.Value) == "true" {
+		return true
+	}
+	return false
+}