oliver/nwg-drawer
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #92 from 6543-forks/reduce_syscalls

Browse Source 
Save result of os.Getenv()
This commit is contained in:
Piotr Miller
2023-07-07 22:43:50 +02:00
committed by GitHub
parent 9582726cb9 ea7813761a
commit edf4c81f85
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -18,4 +18,4 @@ nwg-drawer
/.idea
# Dependency directories (remove the comment below to include it)
# vendor/
vendor/

38
tools.go
View File

@@ -121,11 +121,11 @@ func getUserDir(home, line string) string {
}
func cacheDir() string {
if os.Getenv("XDG_CACHE_HOME") != "" {
return os.Getenv("XDG_CONFIG_HOME")
if xdgCache := os.Getenv("XDG_CACHE_HOME"); xdgCache != "" {
return xdgCache
}
if os.Getenv("HOME") != "" && pathExists(filepath.Join(os.Getenv("HOME"), ".cache")) {
p := filepath.Join(os.Getenv("HOME"), ".cache")
if home := os.Getenv("HOME"); home != "" && pathExists(filepath.Join(home, ".cache")) {
p := filepath.Join(home, ".cache")
return p
}
return ""
@@ -141,11 +141,11 @@ func readTextFile(path string) (string, error) {
}
func oldConfigDir() (string, error) {
if os.Getenv("XDG_CONFIG_HOME") != "" {
dir := path.Join(os.Getenv("XDG_CONFIG_HOME"), "nwg-panel")
if xdgConfig := os.Getenv("XDG_CONFIG_HOME"); xdgConfig != "" {
dir := path.Join(xdgConfig, "nwg-panel")
return dir, nil
} else if os.Getenv("HOME") != "" {
dir := path.Join(os.Getenv("HOME"), ".config/nwg-panel")
} else if home := os.Getenv("HOME"); home != "" {
dir := path.Join(home, ".config/nwg-panel")
return dir, nil
}
@@ -154,10 +154,10 @@ func oldConfigDir() (string, error) {
func configDir() string {
var dir string
if os.Getenv("XDG_CONFIG_HOME") != "" {
dir = path.Join(os.Getenv("XDG_CONFIG_HOME"), "nwg-drawer")
} else if os.Getenv("HOME") != "" {
dir = path.Join(os.Getenv("HOME"), ".config/nwg-drawer")
if xdgConfig := os.Getenv("XDG_CONFIG_HOME"); xdgConfig != "" {
dir = path.Join(xdgConfig, "nwg-drawer")
} else if home := os.Getenv("HOME"); home != "" {
dir = path.Join(home, ".config/nwg-drawer")
}
log.Infof("Config dir: %s", dir)
@@ -168,10 +168,10 @@ func configDir() string {
func dataDir() string {
var dir string
if os.Getenv("XDG_DATA_HOME") != "" {
dir = path.Join(os.Getenv("XDG_DATA_HOME"), "nwg-drawer")
} else if os.Getenv("HOME") != "" {
dir = path.Join(os.Getenv("HOME"), ".local/share/nwg-drawer")
if xdgData := os.Getenv("XDG_DATA_HOME"); xdgData != "" {
dir = path.Join(xdgData, "nwg-drawer")
} else if home := os.Getenv("HOME"); home != "" {
dir = path.Join(home, ".local/share/nwg-drawer")
}
log.Infof("Data dir: %s", dir)
@@ -228,13 +228,11 @@ func copyFile(src, dst string) error {
func getAppDirs() []string {
var dirs []string
xdgDataDirs := ""
home := os.Getenv("HOME")
xdgDataHome := os.Getenv("XDG_DATA_HOME")
if os.Getenv("XDG_DATA_DIRS") != "" {
xdgDataDirs = os.Getenv("XDG_DATA_DIRS")
} else {
xdgDataDirs := os.Getenv("XDG_DATA_DIRS")
if xdgDataDirs == "" {
xdgDataDirs = "/usr/local/share/:/usr/share/"
}
if xdgDataHome != "" {