From 90ba24fa5e48f90fd19e9d922071968404674780 Mon Sep 17 00:00:00 2001 From: Jeevanandam M Date: Sun, 24 Jun 2018 18:33:38 -0700 Subject: [PATCH] added backward capability - without vfs for include references --- forge.go | 2 +- parser.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/forge.go b/forge.go index 6262ce0..3dbdfd3 100644 --- a/forge.go +++ b/forge.go @@ -108,7 +108,7 @@ import ( ) // Version represent current release version of forge. -var Version = "0.5" +var Version = "0.5.1" // ParseBytes takes a []byte representation of the config file, parses it // and responds with `*Section` and potentially an `error` if it cannot diff --git a/parser.go b/parser.go index 01531b3..6f6041f 100644 --- a/parser.go +++ b/parser.go @@ -257,7 +257,11 @@ func (parser *Parser) parseInclude() error { // if it is not absolute path, resolve to relative from parent config directory if !filepath.IsAbs(pattern) && len(parser.files) > 0 { - pattern = path.Join(path.Dir(parser.files[0]), path.Clean(pattern)) + if parser.vfs == nil { + pattern = filepath.Join(filepath.Dir(parser.files[0]), filepath.Clean(pattern)) + } else { + pattern = path.Join(path.Dir(parser.files[0]), path.Clean(pattern)) + } } filenames, err := vfs.Glob(parser.vfs, pattern)