Skip to content

exit-on-change flag #7

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

Merged
jakolehm merged 1 commit into from
Feb 23, 2020
Merged

exit-on-change flag #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func main() {
signal.Notify(done, os.Interrupt)
var cmd *exec.Cmd
cmdSignal := make(chan *processSignal, 1)
go runCommand(cmd, c.Args(), cmdSignal)
go runCommand(cmd, c, cmdSignal)
go handleWatchEvents(watcher, cmdSignal, c.Bool("dir"))

startFileWatch(watcher)
Expand All @@ -79,6 +79,10 @@ func main() {
Aliases: []string{"d"},
Usage: "Track the directories of regular files provided as input and exit if a new file is added.",
},
&cli.IntFlag{
Name: "exit-on-change",
Usage: "Exit on file change with a given code.",
},
},
}

Expand Down Expand Up @@ -134,9 +138,10 @@ func handleWatchEvents(watcher *fsnotify.Watcher, cmdSignal chan *processSignal,
}
}

func runCommand(cmd *exec.Cmd, args cli.Args, cmdSignal chan *processSignal) {
func runCommand(cmd *exec.Cmd, c *cli.Context, cmdSignal chan *processSignal) {
for {
running := true
args := c.Args()
cmd = exec.Command(args.First(), args.Slice()[1:]...)
cmd.Env = os.Environ()
stdoutPipe, _ := cmd.StdoutPipe()
Expand All @@ -157,7 +162,7 @@ func runCommand(cmd *exec.Cmd, args cli.Args, cmdSignal chan *processSignal) {
return
}
logrus.Debugf("got signal %+v", signal)
if signal.exitProcess {
if signal.exitProcess || c.IsSet("exit-on-change") {
running = false
}
cmd.Process.Signal(signal.signal)
Expand All @@ -167,6 +172,11 @@ func runCommand(cmd *exec.Cmd, args cli.Args, cmdSignal chan *processSignal) {
cmd.Wait()
logrus.Debugln("process killed")
if !running {
if c.IsSet("exit-on-change") {
os.Exit(c.Int("exit-on-change"))
} else {
os.Exit(cmd.ProcessState.ExitCode())
}
os.Exit(cmd.ProcessState.ExitCode())
break
}
Expand Down