Skip to content
This repository has been archived by the owner on Jul 30, 2021. It is now read-only.

assets: use MkdirAll to not error on existing dir #886

Merged
merged 2 commits into from Feb 12, 2018
Merged

assets: use MkdirAll to not error on existing dir #886

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc38dc6
assets: use MkdirAll to not error on existing dir
Feb 12, 2018
0a5bfd7
lint the error string
Feb 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion pkg/asset/asset.go
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@ package asset
import (
"crypto/rsa"
"crypto/x509"
"errors"
"fmt"
"io/ioutil"
"net"
Expand Down Expand Up @@ -210,9 +211,16 @@ func (as Assets) Get(name string) (Asset, error) {
}

func (as Assets) WriteFiles(path string) error {
if err := os.Mkdir(path, 0755); err != nil {
if err := os.MkdirAll(path, 0755); err != nil {
return err
}
files, err := ioutil.ReadDir(path)
if err != nil {
return err
}
if len(files) > 0 {
return errors.New("asset directory must be empty")
}
for _, asset := range as {
if err := asset.WriteFile(path); err != nil {
return err
Expand Down