Merge branch 'v2.0' into v2.1
This commit is contained in:
commit
5c091a1871
24 changed files with 737 additions and 341 deletions
|
@ -102,7 +102,8 @@ func (f FileOrContent) IsPath() bool {
|
|||
|
||||
func (f FileOrContent) Read() ([]byte, error) {
|
||||
var content []byte
|
||||
if _, err := os.Stat(f.String()); err == nil {
|
||||
if f.IsPath() {
|
||||
var err error
|
||||
content, err = ioutil.ReadFile(f.String())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue