Skip to content
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

Resolve home dirs to absolute paths in whisky_darwin.go #280

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolve home dirs to absolute paths in whisky_darwin.go #280

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
14 changes: 12 additions & 2 deletions backend/installfinders/launchers/whisky/whisky_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,12 @@ func getWhiskyBottlesPath() (string, error) {
return "", fmt.Errorf("failed to get user home dir: %w", err)
}

defaultBottlesPath := filepath.Join(homeDir, whiskyDefaultBottlesRelativePath)
absHomeDir, err := filepath.Abs(homeDir)
if err != nil {
return "", fmt.Errorf("failed to get absolute path of user home dir: %w", err)
}

defaultBottlesPath := filepath.Join(absHomeDir, whiskyDefaultBottlesRelativePath)

var bottlesPath string

Expand All @@ -93,7 +98,12 @@ func getWhiskyBottlesPath() (string, error) {
if err != nil {
slog.Error("failed to parse Whisky config file", slog.Any("error", err))
} else {
bottlesPath = config.DefaultBottleLocation
if bottlesPath != "" {
bottlesPath, err = filepath.Abs(config.DefaultBottleLocation)
if err != nil {
return "", fmt.Errorf("failed to get absolute path of Whisky bottles path: %w", err)
}
}
}
}

Expand Down
Loading