From 2bc3d1f81b9927c1bd931ae61ef17e783df63454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Mon, 1 Feb 2021 09:26:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D$HOME=E6=9C=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/configs/api_config.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/configs/api_config.go b/internal/configs/api_config.go index dc6eefa2..93a520d0 100644 --- a/internal/configs/api_config.go +++ b/internal/configs/api_config.go @@ -34,14 +34,15 @@ func SharedAPIConfig() (*APIConfig, error) { localFile := Tea.ConfigFile("api.yaml") isFromLocal := false paths := []string{localFile} - homeDir, err := os.UserHomeDir() - if err == nil { + homeDir, homeErr := os.UserHomeDir() + if homeErr == nil { paths = append(paths, homeDir+"/."+teaconst.ProcessName+"/api.yaml") } paths = append(paths, "/etc/"+teaconst.ProcessName+"/api.yaml") // 依次检查文件 var data []byte + var err error for _, path := range paths { data, err = ioutil.ReadFile(path) if err == nil { @@ -73,8 +74,8 @@ func SharedAPIConfig() (*APIConfig, error) { _, err := os.Stat(dbConfigFile) if err == nil { paths := []string{} - homeDir, err := os.UserHomeDir() - if err == nil { + homeDir, homeErr := os.UserHomeDir() + if homeErr == nil { paths = append(paths, homeDir+"/."+teaconst.ProcessName+"/db.yaml") } paths = append(paths, "/etc/"+teaconst.ProcessName+"/db.yaml")