Skip to content

fix: respect HOME env var when expanding ~ in paths #3088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Divyansh670 wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −4
Open

fix: respect HOME env var when expanding ~ in paths #3088

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions pkg/path/home.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,27 @@ func ExpandHomeDir(path string) (string, error) {
if !isHomeDirPath(path) {
return path, nil
}

homeDir, err := os.UserHomeDir()
homeDir, err := userHomeDir()
if err != nil || homeDir == "" {
return "", errors.New("failed to get user home directory")
}

if path == "~" {
return filepath.Clean(homeDir), nil
}

return filepath.Join(homeDir, path[2:]), nil
}

// userHomeDir returns the user's home directory, preferring the HOME
// environment variable (used cross-platform, including in tests) before
// falling back to os.UserHomeDir(), which on Windows reads USERPROFILE
// instead of HOME.
func userHomeDir() (string, error) {
if home := os.Getenv("HOME"); home != "" {
return home, nil
}
return os.UserHomeDir()
}

func isHomeDirPath(path string) bool {
return path == "~" || strings.HasPrefix(path, "~/") || (filepath.Separator == '\\' && strings.HasPrefix(path, `~\`))
}
Loading