Skip to content

fix: add os.environ when using env from yaml #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaad wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: add os.environ when using env from yaml #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a159f81
add os.environ when using env from yaml
May 11, 2020
f2580d8
fix: check if the file is already watched first
aaad Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions realize/notify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,13 @@ func (w *filePoller) Add(name string) error {
return errPollerClosed
}


if w.watches == nil {
w.watches = make(map[string]chan struct{})
} else if _, exists := w.watches[name]; exists {
return fmt.Errorf("watch exists")
}

f, err := os.Open(name)
if err != nil {
return err
Expand All @@ -146,12 +153,6 @@ func (w *filePoller) Add(name string) error {
return err
}

if w.watches == nil {
w.watches = make(map[string]chan struct{})
}
if _, exists := w.watches[name]; exists {
return fmt.Errorf("watch exists")
}
chClose := make(chan struct{})
w.watches[name] = chClose
go w.watch(f, fi, chClose)
Expand Down
17 changes: 16 additions & 1 deletion realize/projects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,10 +562,25 @@ func (p *Project) stamp(t string, o BufferOut, msg string, stream string) {
}()
}

// buildEnvs returns a copy of strings representing the environment,
// in the form "key=value".
func (p Project) buildEnvs() (envs []string) {
envMap := make(map[string]string)

for _, env := range os.Environ() {
e := strings.SplitN(env, "=", 2)

envMap[e[0]] = e[1]
}

for k, v := range p.Env {
envs = append(envs, fmt.Sprintf("%s=%s", strings.Replace(k, "=", "", -1), v))
envMap[strings.Replace(k, "=", "", -1)] = v
}

for k, v := range envMap {
envs = append(envs, fmt.Sprintf("%s=%s", k, v))
}

return
}

Expand Down