diff --git a/internal/pkg/command/command.go b/internal/pkg/command/command.go index fbdca6a..ceba0f3 100644 --- a/internal/pkg/command/command.go +++ b/internal/pkg/command/command.go @@ -140,10 +140,10 @@ func (c Command) Execute(output io.Writer, fake bool) error { if err != nil { return err } - fmt.Fprintln(output, c.Type, "sh", "-c", cmd) + fmt.Fprintf(output, "%s sh -c \"%s\"\n", c.Type, cmd) if !fake { out, err := exec.Command("sh", "-c", cmd).CombinedOutput() - fmt.Fprintln(output, string(out)) + fmt.Fprint(output, string(out)) return err } case CT_REF: diff --git a/internal/pkg/container/container.go b/internal/pkg/container/container.go index 030841c..b2325d7 100644 --- a/internal/pkg/container/container.go +++ b/internal/pkg/container/container.go @@ -236,19 +236,19 @@ func (c *Container) initCommands() { command.NewFunc("assure_netns", func() string { netns_b, err := exec.Command("podman", "inspect", "-f", "{{.NetworkSettings.SandboxKey}}", c.Name).CombinedOutput() if err != nil { - return fmt.Sprintf("%s is not running\n", c.Name) + return fmt.Sprintf("%s is not running", c.Name) } netns := strings.TrimRight(string(netns_b), "\n") err = exec.Command("rm", "-f", "/var/run/netns/"+c.Name).Run() if err != nil { - return fmt.Sprintln("Error:", err) + return fmt.Sprintf("Error: %s", err) } err = exec.Command("ln", "-sf", netns, "/var/run/netns/"+c.Name).Run() if err != nil { fmt.Fprintln(os.Stderr, "Warning: could not establish network namespace", err) - return fmt.Sprintln("Error:", err) + return fmt.Sprintf("Error: %s", err) } - return "" + return fmt.Sprintf("Created /var/run/netns/%s", c.Name) }), } if len(c.Networks) > 0 && !*c.Networks[0].IPv6 {