From f384772e81374d14b121834212aa1cec2f0fac2b Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 28 Aug 2022 20:56:31 +0200 Subject: [PATCH] fix command runner --- blocks/app/main.go | 15 ++++++++++++--- blocks/date/main.go | 14 +++++++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/blocks/app/main.go b/blocks/app/main.go index 6e7a6ee..b471134 100644 --- a/blocks/app/main.go +++ b/blocks/app/main.go @@ -5,12 +5,21 @@ import ( r "gitnet.fr/deblan/i3-blocks-go/rendering" "os" "os/exec" + "sync" ) +func runCmd(wg *sync.WaitGroup, value string) { + defer wg.Done() + command := exec.Command("tmux", "new", "-d", value) + command.Run() +} + func main() { + var wg sync.WaitGroup + if os.Getenv("BLOCK_BUTTON") == "1" { - command := exec.Command("bash", "-c", os.Args[5]) - command.Run() + wg.Add(1) + go runCmd(&wg, os.Args[5]) } options := r.NewBlockOptions() @@ -20,6 +29,6 @@ func main() { }) block := r.Block(os.Args[1], options) - fmt.Println(block) + wg.Wait() } diff --git a/blocks/date/main.go b/blocks/date/main.go index 47570ed..401ef67 100644 --- a/blocks/date/main.go +++ b/blocks/date/main.go @@ -6,14 +6,26 @@ import ( "github.com/itchyny/timefmt-go" r "gitnet.fr/deblan/i3-blocks-go/rendering" "os" + "os/exec" + "sync" "time" ) +func runCalendar(wg *sync.WaitGroup) { + defer wg.Done() + command := exec.Command("tmux", "new", "-d", "gnome-calendar") + command.Run() +} + func main() { argFormat := os.Args[1] now := time.Now() + var wg sync.WaitGroup + if os.Getenv("BLOCK_BUTTON") == "1" { + wg.Add(1) + go runCalendar(&wg) } symbol := r.Emoji(emoji.Calendar) @@ -26,6 +38,6 @@ func main() { }) block := r.Block("date", options) - fmt.Println(block) + wg.Wait() }