custom workDir function to handle speical case in Windows

This commit is contained in:
Unknwon 2015-08-02 11:41:28 +08:00
parent cc0d963f75
commit 1490e862cc
1 changed files with 12 additions and 1 deletions

View File

@ -168,7 +168,18 @@ func ExecPath() (string, error) {
// WorkDir returns absolute path of work directory. // WorkDir returns absolute path of work directory.
func WorkDir() (string, error) { func WorkDir() (string, error) {
execPath, err := ExecPath() execPath, err := ExecPath()
return path.Dir(strings.Replace(execPath, "\\", "/", -1)), err if err != nil {
return execPath, err
}
// Note: we don't use path.Dir here because it does not handle case
// which path starts with two "/" in Windows: "//psf/Home/..."
execPath = strings.Replace(execPath, "\\", "/", -1)
i := strings.LastIndex(execPath, "/")
if i == -1 {
return execPath, nil
}
return execPath[:i], nil
} }
func forcePathSeparator(path string) { func forcePathSeparator(path string) {