niklas/sunset
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

command now gets the image as a parameter

Browse Source
This commit is contained in:
Niklas 2020-10-27 22:29:11 +01:00
parent 9592e4bb63
commit fb8849322d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.go
View File

@ -145,18 +145,21 @@ func currentImage(configPath string, config sunsetConfig) string {
return absFile return absFile
} }
func block(config sunsetConfig, command string) { func block(configPath string, config sunsetConfig, command string) {
image := currentImage(configPath, config)
go runCommand(command, image)
for { for {
nextHr, nextMin := getNextWait(config) nextHr, nextMin := getNextWait(config)
timer := time.NewTimer((time.Duration(nextHr) * time.Hour) + (time.Duration(nextMin) * time.Minute)) timer := time.NewTimer((time.Duration(nextHr) * time.Hour) + (time.Duration(nextMin) * time.Minute))
<-timer.C <-timer.C
log.Printf("Running command: %s\n", command) log.Printf("Running command: %s\n", command)
go runCommand(command) image := currentImage(configPath, config)
go runCommand(command, image)
} }
} }
func runCommand(command string) { func runCommand(command, image string) {
cmd := exec.Command("/usr/bin/env", "sh", "-c", command) cmd := exec.Command(command, image)
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
log.Printf("Command %s returned a non 0 code", command) log.Printf("Command %s returned a non 0 code", command)
@ -184,7 +187,7 @@ func main() {
fmt.Println("Must provide a command.") fmt.Println("Must provide a command.")
os.Exit(1) os.Exit(1)
} }
block(conf, *blockCommand) block(*configFile, conf, *blockCommand)
} else { } else {
fmt.Printf("%s", currentImage(*configFile, conf)) fmt.Printf("%s", currentImage(*configFile, conf))
} }