From 927e4c7e4df255b4091a3301875bb190a4e08f04 Mon Sep 17 00:00:00 2001 From: Junjie Yuan Date: Thu, 22 Apr 2021 15:10:35 +0800 Subject: [PATCH] using filepath.Join() instead of path.Join() to fix wrong filepath on Windows: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PS C:\Users\Junjie Yuan> gh auth status github.com ✓ Logged in to github.com as junjieyuan (C:\Users\Junjie Yuan\.config\gh/hosts.yml) ✓ Git operations for github.com configured to use https protocol. ✓ Token: ******************* Signed-off-by: Junjie Yuan --- cmd/gh/main.go | 3 +-- internal/config/config_file.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/gh/main.go b/cmd/gh/main.go index 3ba5da9cf..31e90d3fb 100644 --- a/cmd/gh/main.go +++ b/cmd/gh/main.go @@ -7,7 +7,6 @@ import ( "net" "os" "os/exec" - "path" "path/filepath" "strings" "time" @@ -259,7 +258,7 @@ func checkForUpdate(currentVersion string) (*update.ReleaseInfo, error) { } repo := updaterEnabled - stateFilePath := path.Join(config.ConfigDir(), "state.yml") + stateFilePath := filepath.Join(config.ConfigDir(), "state.yml") return update.CheckForUpdate(client, stateFilePath, repo, currentVersion) } diff --git a/internal/config/config_file.go b/internal/config/config_file.go index fdd38d04d..540bafa46 100644 --- a/internal/config/config_file.go +++ b/internal/config/config_file.go @@ -28,11 +28,11 @@ func ConfigDir() string { } func ConfigFile() string { - return path.Join(ConfigDir(), "config.yml") + return filepath.Join(ConfigDir(), "config.yml") } func HostsConfigFile() string { - return path.Join(ConfigDir(), "hosts.yml") + return filepath.Join(ConfigDir(), "hosts.yml") } func ParseDefaultConfig() (Config, error) {