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(scm): convert to Windows path with / instead of \

Browse source
This commit is contained in:
L. Yeung 2022-08-29 21:55:58 +08:00 committed by Jan De Dobbeleer
parent 7e141fb5ec
commit 0b77995d80
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/environment/shell_unix.go
View file

@ -106,7 +106,7 @@ func (env *ShellEnvironment) InWSLSharedDrive() bool {
} }
func (env *ShellEnvironment) ConvertToWindowsPath(path string) string { func (env *ShellEnvironment) ConvertToWindowsPath(path string) string {
windowsPath, err := env.RunCommand("wslpath", "-w", path) windowsPath, err := env.RunCommand("wslpath", "-m", path)
if err == nil { if err == nil {
return windowsPath return windowsPath
} }

2
src/environment/shell_windows.go
View file

@ -228,7 +228,7 @@ func (env *ShellEnvironment) InWSLSharedDrive() bool {
} }
func (env *ShellEnvironment) ConvertToWindowsPath(path string) string { func (env *ShellEnvironment) ConvertToWindowsPath(path string) string {
return path return strings.ReplaceAll(path, `\`, "/")
} }
func (env *ShellEnvironment) ConvertToLinuxPath(path string) string { func (env *ShellEnvironment) ConvertToLinuxPath(path string) string {

6
src/segments/scm.go
View file

@ -94,10 +94,10 @@ func (s *scm) FileContents(folder, file string) string {
} }
func (s *scm) convertToWindowsPath(path string) string { func (s *scm) convertToWindowsPath(path string) string {
if !s.IsWslSharedPath { if s.env.GOOS() == environment.WINDOWS || s.IsWslSharedPath {
return path
}
return s.env.ConvertToWindowsPath(path) return s.env.ConvertToWindowsPath(path)
}
return path
} }
func (s *scm) convertToLinuxPath(path string) string { func (s *scm) convertToLinuxPath(path string) string {

2
src/segments/svn.go
View file

@ -81,7 +81,7 @@ func (s *Svn) shouldDisplay() bool {
s.workingDir = Svndir.Path s.workingDir = Svndir.Path
s.rootDir = Svndir.Path s.rootDir = Svndir.Path
// convert the worktree file path to a windows one when in wsl 2 shared folder // convert the worktree file path to a windows one when in wsl 2 shared folder
s.realDir = strings.TrimSuffix(s.convertToWindowsPath(Svndir.Path), ".svn") s.realDir = strings.TrimSuffix(s.convertToWindowsPath(Svndir.Path), "/.svn")
return true return true
} }
// handle worktree // handle worktree