Skip to content

Use USERPROFILE on windows instead of HOME #1898

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
chtenb wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use USERPROFILE on windows instead of HOME #1898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0912f96
Use USERPROFILE on windows as HOME
chtenb Apr 25, 2025
9db96db
Remove debug statement
chtenb Apr 25, 2025
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
1 change: 1 addition & 0 deletions pkg/env/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const (

// Only used on Windows
PATHEXT = "PATHEXT"
USERPROFILE = "USERPROFILE"

// Only used in tests
ELVISH_TEST_TIME_SCALE = "ELVISH_TEST_TIME_SCALE"
Expand Down
11 changes: 7 additions & 4 deletions pkg/fsutil/gethome.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@ func GetHome(uname string) (string, error) {
if uname == "" {
// Use $HOME as override if we are looking for the home of the current
// variable.
home := os.Getenv(env.HOME)
if home != "" {
if runtime.GOOS == "windows" {
if runtime.GOOS == "windows" {
home := os.Getenv(env.USERPROFILE)
if home != "" {
return strings.TrimRight(home, "/\\"), nil
} else {
}
} else {
home := os.Getenv(env.HOME)
if home != "" {
return strings.TrimRight(home, "/"), nil
}
}
Expand Down