fix path problem
This commit is contained in:
parent
e01563908b
commit
9cd07380e5
@ -75,19 +75,18 @@ func (p *Project) Watching() {
|
|||||||
|
|
||||||
defer end()
|
defer end()
|
||||||
|
|
||||||
p.Path = slash(p.Path)
|
|
||||||
p.Main = slash(p.Main)
|
p.Main = slash(p.Main)
|
||||||
p.Base = base + p.Path
|
p.base = base + p.Path
|
||||||
|
|
||||||
for _, dir := range p.Watcher.Paths {
|
for _, dir := range p.Watcher.Paths {
|
||||||
// check main existence
|
// check main existence
|
||||||
dir = slash(dir)
|
dir = slash(dir)
|
||||||
if _, err := os.Stat(p.Base + dir + p.Main); err != nil {
|
if _, err := os.Stat(p.base + dir + p.Main); err != nil {
|
||||||
Fail(p.Name + ": \t" + p.Base + dir + p.Main + " doesn't exist. Main is required")
|
Fail(p.Name + ": \t" + p.base + dir + p.Main + " doesn't exist. Main is required")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
base = p.Base + dir
|
base = p.base + dir
|
||||||
if _, err := os.Stat(base); err == nil {
|
if _, err := os.Stat(base); err == nil {
|
||||||
if err := filepath.Walk(base, walk); err != nil {
|
if err := filepath.Walk(base, walk); err != nil {
|
||||||
Fail(err.Error())
|
Fail(err.Error())
|
||||||
@ -167,7 +166,7 @@ func (p *Project) run(channel chan bool, wr *sync.WaitGroup) {
|
|||||||
func (p *Project) ignore(str string) bool {
|
func (p *Project) ignore(str string) bool {
|
||||||
for _, v := range p.Watcher.Ignore {
|
for _, v := range p.Watcher.Ignore {
|
||||||
v = slash(v)
|
v = slash(v)
|
||||||
if strings.Contains(str, p.Base + v) {
|
if strings.Contains(str, p.base + v) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user