yoshie
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: gosec

main
sudo pacman -Syu 2024-09-04 22:25:39 +07:00
parent 4bb0fa1f8a
commit 8dde99010d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/config/config.go
View File

@ -45,13 +45,13 @@ type cfg struct {
// LoadConfig return config, configDemo // LoadConfig return config, configDemo
func LoadConfig(path string, isDryRun bool) (Config, error) { func LoadConfig(path string, isDryRun bool) (Config, error) {
configPathJSON := filepath.Join(path, configDirPath, configFileJSON) configPathJSON := filepath.Clean(filepath.Join(path, configDirPath, configFileJSON))
bytes, err := os.ReadFile(configPathJSON) bytes, err := os.ReadFile(configPathJSON)
if err == nil { if err == nil {
return loadConfig(bytes, isDryRun, json.Unmarshal) return loadConfig(bytes, isDryRun, json.Unmarshal)
} }
configPathTOML := filepath.Join(path, configDirPath, configFileTOML) configPathTOML := filepath.Clean(filepath.Join(path, configDirPath, configFileTOML))
bytes, err = os.ReadFile(configPathTOML) bytes, err = os.ReadFile(configPathTOML)
if err == nil { if err == nil {
return loadConfig(bytes, isDryRun, toml.Unmarshal) return loadConfig(bytes, isDryRun, toml.Unmarshal)
@ -219,7 +219,7 @@ func (c *cfg) Download(appNames ...string) error {
// Copy from github.com/make-go-great/copy-go // Copy from github.com/make-go-great/copy-go
// Make sure nested dir is exist before copying file // Make sure nested dir is exist before copying file
dstDir := filepath.Dir(p.Internal) dstDir := filepath.Dir(p.Internal)
if err := os.MkdirAll(dstDir, os.ModePerm); err != nil { if err := os.MkdirAll(dstDir, 0o750); err != nil {
return fmt.Errorf("os: failed to mkdir all [%s]: %w", dstDir, err) return fmt.Errorf("os: failed to mkdir all [%s]: %w", dstDir, err)
} }
@ -227,7 +227,9 @@ func (c *cfg) Download(appNames ...string) error {
return fmt.Errorf("os: failed to write file: %w", err) return fmt.Errorf("os: failed to write file: %w", err)
} }
httpRsp.Body.Close() if err := httpRsp.Body.Close(); err != nil {
return fmt.Errorf("http client: failed to close body: %w", err)
}
return nil return nil
}) })