From 28a0be1d87048a88c12f62a6cff2b0e8d4557917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Abdelkader=20Mart=C3=ADnez=20P=C3=A9rez?= Date: Tue, 22 Oct 2019 11:56:18 +0200 Subject: [PATCH] Allow kapow server to run without .pow file and non-interactive Co-authored-by: pancho horrillo --- internal/cmd/server.go | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/internal/cmd/server.go b/internal/cmd/server.go index e8d0713..f3e54c7 100644 --- a/internal/cmd/server.go +++ b/internal/cmd/server.go @@ -30,23 +30,25 @@ var ServerCmd = &cobra.Command{ go server.StartServer(controlBind, dataBind, userBind) // start sub shell + ENV(KAPOW_CONTROL_URL) - powfile := args[0] - _, err := os.Stat(powfile) - if os.IsNotExist(err) { - log.Fatalf("%s does not exist", powfile) - } - log.Printf("Running powfile: %q\n", powfile) - kapowCMD := exec.Command("bash", powfile) - kapowCMD.Stdout = os.Stdout - kapowCMD.Stderr = os.Stderr - kapowCMD.Env = append(os.Environ(), "KAPOW_CONTROL_URL=http://"+controlBind) + if len(args) > 0 { + powfile := args[0] + _, err := os.Stat(powfile) + if os.IsNotExist(err) { + log.Fatalf("%s does not exist", powfile) + } + log.Printf("Running powfile: %q\n", powfile) + kapowCMD := exec.Command("bash", powfile) + kapowCMD.Stdout = os.Stdout + kapowCMD.Stderr = os.Stderr + kapowCMD.Env = append(os.Environ(), "KAPOW_CONTROL_URL=http://"+controlBind) - err = kapowCMD.Run() - if err != nil { - log.Fatal(err) + err = kapowCMD.Run() + if err != nil { + log.Fatal(err) + } + fmt.Println() + log.Printf("Done running powfile: %q\n", powfile) } - fmt.Println() - log.Printf("Done running powfile: %q\n", powfile) select {} },