mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-01-30 12:32:22 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(config): resolve path for all shells

Browse source
This commit is contained in:
Jan De Dobbeleer 2021-12-30 15:39:30 +01:00 committed by Jan De Dobbeleer
parent 5549e0d7ad
commit 7aaa7b110f
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/environment.go
View file

@ -164,6 +164,7 @@ type environment struct {
func (env *environment) init(args *args) { func (env *environment) init(args *args) {
env.args = args env.args = args
env.resolveConfigPath()
env.cmdCache = &commandCache{ env.cmdCache = &commandCache{
commands: newConcurrentMap(), commands: newConcurrentMap(),
} }
@ -175,6 +176,23 @@ func (env *environment) init(args *args) {
env.fileCache.init(env.getCachePath()) env.fileCache.init(env.getCachePath())
} }
func (env *environment) resolveConfigPath() {
if env.args == nil || env.args.Config == nil {
return
}
configFile := *env.args.Config
if strings.HasPrefix(configFile, "~") {
configFile = strings.TrimPrefix(configFile, "~")
configFile = filepath.Join(env.homeDir(), configFile)
}
if !filepath.IsAbs(configFile) {
if absConfigFile, err := filepath.Abs(configFile); err == nil {
configFile = absConfigFile
}
}
*env.args.Config = filepath.Clean(configFile)
}
func (env *environment) trace(start time.Time, function string, args ...string) { func (env *environment) trace(start time.Time, function string, args ...string) {
if !env.debug { if !env.debug {
return return