From 35dd0b89f1c53c7c213b8e94f3a090acedcd83bc Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Thu, 11 Aug 2022 15:54:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/configs/api_config.go | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/internal/configs/api_config.go b/internal/configs/api_config.go index 21d9772a..23b5444a 100644 --- a/internal/configs/api_config.go +++ b/internal/configs/api_config.go @@ -109,26 +109,38 @@ func (this *APIConfig) WriteFile(path string) error { return err } + err = os.WriteFile(path, data, 0666) + if err != nil { + return err + } + // 写入 ~/ 和 /etc/ 目录,因为是备份需要,所以不需要提示错误信息 // 写入 ~/.edge-admin/ - filename := filepath.Base(path) + // 这个用来判断用户是否为重装,所以比较重要 + var filename = filepath.Base(path) homeDir, homeErr := os.UserHomeDir() if homeErr == nil { dir := homeDir + "/." + teaconst.ProcessName stat, err := os.Stat(dir) if err == nil && stat.IsDir() { - _ = os.WriteFile(dir+"/"+filename, data, 0666) + err = os.WriteFile(dir+"/"+filename, data, 0666) + if err != nil { + return err + } } else if err != nil && os.IsNotExist(err) { err = os.Mkdir(dir, 0777) if err == nil { - _ = os.WriteFile(dir+"/"+filename, data, 0666) + err = os.WriteFile(dir+"/"+filename, data, 0666) + if err != nil { + return err + } } } } // 写入 /etc/edge-admin { - dir := "/etc/" + teaconst.ProcessName + var dir = "/etc/" + teaconst.ProcessName stat, err := os.Stat(dir) if err == nil && stat.IsDir() { _ = os.WriteFile(dir+"/"+filename, data, 0666) @@ -140,10 +152,5 @@ func (this *APIConfig) WriteFile(path string) error { } } - err = os.WriteFile(path, data, 0666) - if err != nil { - return err - } - return nil }