Skip to content
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.

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

Wait for subprocess to finish #224

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions cmd/godotenv/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import (
"flag"
"fmt"
"log"
"os"
"os/exec"
"os/signal"
"strings"

"github.com/joho/godotenv"
Expand Down Expand Up @@ -44,12 +47,23 @@ example
envFilenames = strings.Split(rawEnvFilenames, ",")
}

if err := godotenv.Load(envFilenames...); err != nil {
log.Fatal(err)
}
// take rest of args and "exec" them
cmd := args[0]
cmdArgs := args[1:]

err := godotenv.Exec(envFilenames, cmd, cmdArgs, overload)
if err != nil {
command := exec.Command(cmd, cmdArgs...)
command.Stdin = os.Stdin
command.Stdout = os.Stdout
command.Stderr = os.Stderr

// Ignore interrupts so we don't exit before the sub-process does.
// This signal will still get passed to the sub-process.
signal.Ignore(os.Interrupt)

if err := command.Run(); err != nil {
log.Fatal(err)
}
}