kemko/xc
1
0
Fork 0
mirror of https://github.com/kemko/xc.git synced 2026-01-01 15:55:43 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

local ini uses config expandpath helper

Browse Source
This commit is contained in:
Pavel Vorobyov
2019-09-25 17:15:30 +03:00
parent 15d5a66c40
commit ecc649237c
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/localini/localini.go
View File

@@ -39,7 +39,7 @@ func New(cfg *config.XCConfig) (*LocalIni, error) {
if !found { if !found {
return nil, fmt.Errorf("localini backend filename option is missing") return nil, fmt.Errorf("localini backend filename option is missing")
} }
return &LocalIni{filename: filename}, nil return &LocalIni{filename: config.ExpandPath(filename)}, nil
} }
// Hosts exported backend method // Hosts exported backend method

16
config/config.go
View File

@@ -126,7 +126,9 @@ var (
defaultUser = os.Getenv("USER") defaultUser = os.Getenv("USER")
) )
func expandPath(path string) string { // ExpandPath helper helps to expand ~ as a home directory
// as well as it expands any env variable usage in path
func ExpandPath(path string) string {
if strings.HasPrefix(path, "~/") { if strings.HasPrefix(path, "~/") {
path = "$HOME/" + path[2:] path = "$HOME/" + path[2:]
} }
@@ -166,19 +168,19 @@ func read(filename string, secondPass bool) (*XCConfig, error) {
if err != nil { if err != nil {
hf = defaultHistoryFile hf = defaultHistoryFile
} }
cfg.Readline.HistoryFile = expandPath(hf) cfg.Readline.HistoryFile = ExpandPath(hf)
rcf, err := props.GetString("main.rc_file") rcf, err := props.GetString("main.rc_file")
if err != nil { if err != nil {
rcf = defaultRCfile rcf = defaultRCfile
} }
cfg.RCfile = expandPath(rcf) cfg.RCfile = ExpandPath(rcf)
lf, err := props.GetString("main.log_file") lf, err := props.GetString("main.log_file")
if err != nil { if err != nil {
lf = defaultLogFile lf = defaultLogFile
} }
cfg.LogFile = expandPath(lf) cfg.LogFile = ExpandPath(lf)
cttl, err := props.GetInt("main.cache_ttl") cttl, err := props.GetInt("main.cache_ttl")
if err != nil { if err != nil {
@@ -190,7 +192,7 @@ func read(filename string, secondPass bool) (*XCConfig, error) {
if err != nil { if err != nil {
cd = defaultCacheDir cd = defaultCacheDir
} }
cfg.CacheDir = expandPath(cd) cfg.CacheDir = ExpandPath(cd)
user, err := props.GetString("main.user") user, err := props.GetString("main.user")
if err != nil || user == "" { if err != nil || user == "" {
@@ -333,7 +335,7 @@ func read(filename string, secondPass bool) (*XCConfig, error) {
for _, key := range pmgrkeys { for _, key := range pmgrkeys {
if key == "path" { if key == "path" {
pluginPath, _ := props.GetString("passmgr.path") pluginPath, _ := props.GetString("passmgr.path")
cfg.PasswordManagerPath = expandPath(pluginPath) cfg.PasswordManagerPath = ExpandPath(pluginPath)
} else { } else {
cfg.PasswordManagerOptions[key], _ = props.GetString(fmt.Sprintf("passmgr.%s", key)) cfg.PasswordManagerOptions[key], _ = props.GetString(fmt.Sprintf("passmgr.%s", key))
} }
@@ -345,7 +347,7 @@ func read(filename string, secondPass bool) (*XCConfig, error) {
if err == nil { if err == nil {
for _, key := range envkeys { for _, key := range envkeys {
value, _ := props.GetString(fmt.Sprintf("environ.%s", key)) value, _ := props.GetString(fmt.Sprintf("environ.%s", key))
cfg.LocalEnvironment[key] = expandPath(value) cfg.LocalEnvironment[key] = ExpandPath(value)
} }
} }