TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-04 13:10:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复$HOME未定义问题

Browse Source
This commit is contained in:
GoEdgeLab
2021-02-01 09:25:57 +08:00
parent 7d64fc579c
commit cf196915e4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/configs/api_config.go
View File

@@ -24,13 +24,14 @@ func LoadAPIConfig() (*APIConfig, error) {
localFile := Tea.ConfigFile("api.yaml") localFile := Tea.ConfigFile("api.yaml")
isFromLocal := false isFromLocal := false
paths := []string{localFile} paths := []string{localFile}
homeDir, err := os.UserHomeDir() homeDir, homeErr := os.UserHomeDir()
if err == nil { if homeErr == nil {
paths = append(paths, homeDir+"/."+teaconst.ProcessName+"/api.yaml") paths = append(paths, homeDir+"/."+teaconst.ProcessName+"/api.yaml")
} }
paths = append(paths, "/etc/"+teaconst.ProcessName+"/api.yaml") paths = append(paths, "/etc/"+teaconst.ProcessName+"/api.yaml")
var data []byte var data []byte
var err error
for _, path := range paths { for _, path := range paths {
data, err = ioutil.ReadFile(path) data, err = ioutil.ReadFile(path)
if err == nil { if err == nil {
@@ -69,8 +70,8 @@ func (this *APIConfig) WriteFile(path string) error {
// 写入 ~/ 和 /etc/ 目录，因为是备份需要，所以不需要提示错误信息 // 写入 ~/ 和 /etc/ 目录，因为是备份需要，所以不需要提示错误信息
// 写入 ~/.edge-admin/ // 写入 ~/.edge-admin/
filename := filepath.Base(path) filename := filepath.Base(path)
homeDir, err := os.UserHomeDir() homeDir, homeErr := os.UserHomeDir()
if err == nil { if homeErr == nil {
dir := homeDir + "/." + teaconst.ProcessName dir := homeDir + "/." + teaconst.ProcessName
stat, err := os.Stat(dir) stat, err := os.Stat(dir)
if err == nil && stat.IsDir() { if err == nil && stat.IsDir() {