mirror of
https://github.com/tulir/gomuks.git
synced 2025-04-20 18:43:41 -05:00
Move directory logic to init backend
This commit is contained in:
parent
4ebdb0fd38
commit
edda1a956a
2 changed files with 92 additions and 84 deletions
88
initialize/dirs.go
Normal file
88
initialize/dirs.go
Normal file
|
@ -0,0 +1,88 @@
|
|||
package initialize
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func getRootDir(subdir string) string {
|
||||
rootDir := os.Getenv("GOMUKS_ROOT")
|
||||
if rootDir == "" {
|
||||
return ""
|
||||
}
|
||||
return filepath.Join(rootDir, subdir)
|
||||
}
|
||||
|
||||
func UserCacheDir() (dir string, err error) {
|
||||
dir = os.Getenv("GOMUKS_CACHE_HOME")
|
||||
if dir == "" {
|
||||
dir = getRootDir("cache")
|
||||
}
|
||||
if dir == "" {
|
||||
dir, err = os.UserCacheDir()
|
||||
dir = filepath.Join(dir, "gomuks")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func UserDataDir() (dir string, err error) {
|
||||
dir = os.Getenv("GOMUKS_DATA_HOME")
|
||||
if dir != "" {
|
||||
return
|
||||
}
|
||||
if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
|
||||
return UserConfigDir()
|
||||
}
|
||||
dir = getRootDir("data")
|
||||
if dir == "" {
|
||||
dir = os.Getenv("XDG_DATA_HOME")
|
||||
}
|
||||
if dir == "" {
|
||||
dir = os.Getenv("HOME")
|
||||
if dir == "" {
|
||||
return "", errors.New("neither $XDG_DATA_HOME nor $HOME are defined")
|
||||
}
|
||||
dir = filepath.Join(dir, ".local", "share")
|
||||
}
|
||||
dir = filepath.Join(dir, "gomuks")
|
||||
return
|
||||
}
|
||||
|
||||
func getXDGUserDir(name string) (dir string, err error) {
|
||||
cmd := exec.Command("xdg-user-dir", name)
|
||||
var out strings.Builder
|
||||
cmd.Stdout = &out
|
||||
err = cmd.Run()
|
||||
dir = strings.TrimSpace(out.String())
|
||||
return
|
||||
}
|
||||
|
||||
func UserDownloadDir() (dir string, err error) {
|
||||
dir = os.Getenv("GOMUKS_DOWNLOAD_HOME")
|
||||
if dir != "" {
|
||||
return
|
||||
}
|
||||
dir, _ = getXDGUserDir("DOWNLOAD")
|
||||
if dir != "" {
|
||||
return
|
||||
}
|
||||
dir, err = os.UserHomeDir()
|
||||
dir = filepath.Join(dir, "Downloads")
|
||||
return
|
||||
}
|
||||
|
||||
func UserConfigDir() (dir string, err error) {
|
||||
dir = os.Getenv("GOMUKS_CONFIG_HOME")
|
||||
if dir == "" {
|
||||
dir = getRootDir("config")
|
||||
}
|
||||
if dir == "" {
|
||||
dir, err = os.UserConfigDir()
|
||||
dir = filepath.Join(dir, "gomuks")
|
||||
}
|
||||
return
|
||||
}
|
88
main.go
88
main.go
|
@ -17,10 +17,8 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strings"
|
||||
|
@ -130,22 +128,22 @@ func main() {
|
|||
|
||||
var configDir, dataDir, cacheDir, downloadDir string
|
||||
|
||||
configDir, err = UserConfigDir()
|
||||
configDir, err = initialize.UserConfigDir()
|
||||
if err != nil {
|
||||
_, _ = fmt.Fprintln(os.Stderr, "Failed to get config directory:", err)
|
||||
os.Exit(3)
|
||||
}
|
||||
dataDir, err = UserDataDir()
|
||||
dataDir, err = initialize.UserDataDir()
|
||||
if err != nil {
|
||||
_, _ = fmt.Fprintln(os.Stderr, "Failed to get data directory:", err)
|
||||
os.Exit(3)
|
||||
}
|
||||
cacheDir, err = UserCacheDir()
|
||||
cacheDir, err = initialize.UserCacheDir()
|
||||
if err != nil {
|
||||
_, _ = fmt.Fprintln(os.Stderr, "Failed to get cache directory:", err)
|
||||
os.Exit(3)
|
||||
}
|
||||
downloadDir, err = UserDownloadDir()
|
||||
downloadDir, err = initialize.UserDownloadDir()
|
||||
if err != nil {
|
||||
_, _ = fmt.Fprintln(os.Stderr, "Failed to get download directory:", err)
|
||||
os.Exit(3)
|
||||
|
@ -182,81 +180,3 @@ func main() {
|
|||
fmt.Println("Unexpected exit by return from gmx.Start().")
|
||||
os.Exit(2)
|
||||
}
|
||||
|
||||
func getRootDir(subdir string) string {
|
||||
rootDir := os.Getenv("GOMUKS_ROOT")
|
||||
if rootDir == "" {
|
||||
return ""
|
||||
}
|
||||
return filepath.Join(rootDir, subdir)
|
||||
}
|
||||
|
||||
func UserCacheDir() (dir string, err error) {
|
||||
dir = os.Getenv("GOMUKS_CACHE_HOME")
|
||||
if dir == "" {
|
||||
dir = getRootDir("cache")
|
||||
}
|
||||
if dir == "" {
|
||||
dir, err = os.UserCacheDir()
|
||||
dir = filepath.Join(dir, "gomuks")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func UserDataDir() (dir string, err error) {
|
||||
dir = os.Getenv("GOMUKS_DATA_HOME")
|
||||
if dir != "" {
|
||||
return
|
||||
}
|
||||
if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
|
||||
return UserConfigDir()
|
||||
}
|
||||
dir = getRootDir("data")
|
||||
if dir == "" {
|
||||
dir = os.Getenv("XDG_DATA_HOME")
|
||||
}
|
||||
if dir == "" {
|
||||
dir = os.Getenv("HOME")
|
||||
if dir == "" {
|
||||
return "", errors.New("neither $XDG_DATA_HOME nor $HOME are defined")
|
||||
}
|
||||
dir = filepath.Join(dir, ".local", "share")
|
||||
}
|
||||
dir = filepath.Join(dir, "gomuks")
|
||||
return
|
||||
}
|
||||
|
||||
func getXDGUserDir(name string) (dir string, err error) {
|
||||
cmd := exec.Command("xdg-user-dir", name)
|
||||
var out strings.Builder
|
||||
cmd.Stdout = &out
|
||||
err = cmd.Run()
|
||||
dir = strings.TrimSpace(out.String())
|
||||
return
|
||||
}
|
||||
|
||||
func UserDownloadDir() (dir string, err error) {
|
||||
dir = os.Getenv("GOMUKS_DOWNLOAD_HOME")
|
||||
if dir != "" {
|
||||
return
|
||||
}
|
||||
dir, _ = getXDGUserDir("DOWNLOAD")
|
||||
if dir != "" {
|
||||
return
|
||||
}
|
||||
dir, err = os.UserHomeDir()
|
||||
dir = filepath.Join(dir, "Downloads")
|
||||
return
|
||||
}
|
||||
|
||||
func UserConfigDir() (dir string, err error) {
|
||||
dir = os.Getenv("GOMUKS_CONFIG_HOME")
|
||||
if dir == "" {
|
||||
dir = getRootDir("config")
|
||||
}
|
||||
if dir == "" {
|
||||
dir, err = os.UserConfigDir()
|
||||
dir = filepath.Join(dir, "gomuks")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue