mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-03-05 20:49:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: sync Pwd()

Browse source 
relates to #2038
This commit is contained in:
Jan De Dobbeleer 2022-04-09 19:43:58 +02:00 committed by Jan De Dobbeleer
parent 10c0bc7383
commit 40470f7d22
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/environment/shell.go
View file

@ -316,7 +316,9 @@ func (env *ShellEnvironment) Getenv(key string) string {
func (env *ShellEnvironment) Pwd() string { func (env *ShellEnvironment) Pwd() string {
defer env.trace(time.Now(), "Pwd") defer env.trace(time.Now(), "Pwd")
env.lock.Lock()
defer func() { defer func() {
env.lock.Unlock()
env.log(Debug, "Pwd", env.cwd) env.log(Debug, "Pwd", env.cwd)
}() }()
if env.cwd != "" { if env.cwd != "" {
@ -728,21 +730,8 @@ func (env *ShellEnvironment) TemplateCache() *TemplateCache {
return tmplCache return tmplCache
} }
func (env *ShellEnvironment) DirMatchesOneOf(dir string, regexes []string) (match bool) { func (env *ShellEnvironment) DirMatchesOneOf(dir string, regexes []string) bool {
// sometimes the function panics inside golang, we want to silence that error return dirMatchesOneOf(dir, env.Home(), env.GOOS(), regexes)
// and assume that there's no match. Not perfect, but better than crashing
// for the time being until we figure out what the actual root cause is
defer func() {
if err := recover(); err != nil {
message := fmt.Sprintf("%s", err)
env.log(Error, "DirMatchesOneOf", message)
match = false
}
}()
env.lock.Lock()
defer env.lock.Unlock()
match = dirMatchesOneOf(dir, env.Home(), env.GOOS(), regexes)
return
} }
func dirMatchesOneOf(dir, home, goos string, regexes []string) bool { func dirMatchesOneOf(dir, home, goos string, regexes []string) bool {