From 61d488a783d9ff2d01e1be07b49cb05deabc0a17 Mon Sep 17 00:00:00 2001 From: James Tatum Date: Tue, 17 Dec 2024 12:13:08 -0800 Subject: [PATCH] Resolve home dirs to absolute paths in whisky_darwin.go --- .../launchers/whisky/whisky_darwin.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/backend/installfinders/launchers/whisky/whisky_darwin.go b/backend/installfinders/launchers/whisky/whisky_darwin.go index 1394859e..35b8cb02 100644 --- a/backend/installfinders/launchers/whisky/whisky_darwin.go +++ b/backend/installfinders/launchers/whisky/whisky_darwin.go @@ -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 @@ -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) + } + } } }