From cf196915e4362a6fd4b1f49c97ddd449d68e10e0 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Mon, 1 Feb 2021 09:25:57 +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 199c29ac..f7cec081 100644 --- a/internal/configs/api_config.go +++ b/internal/configs/api_config.go @@ -24,13 +24,14 @@ func LoadAPIConfig() (*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 { @@ -69,8 +70,8 @@ func (this *APIConfig) WriteFile(path string) error { // 写入 ~/ 和 /etc/ 目录,因为是备份需要,所以不需要提示错误信息 // 写入 ~/.edge-admin/ filename := filepath.Base(path) - homeDir, err := os.UserHomeDir() - if err == nil { + homeDir, homeErr := os.UserHomeDir() + if homeErr == nil { dir := homeDir + "/." + teaconst.ProcessName stat, err := os.Stat(dir) if err == nil && stat.IsDir() {