From e7a49582c7ef9639f102e7503e2de368e0e57dd0 Mon Sep 17 00:00:00 2001 From: Martin Nirtl Date: Sat, 8 Feb 2020 13:35:23 +0100 Subject: [PATCH] rename func from JoinCommandSlices to JoinCommand --- internal/commands/logscmd/root.go | 2 +- internal/commands/upcmd/root.go | 2 +- pkg/externalcommand/externalcommand.go | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/commands/logscmd/root.go b/internal/commands/logscmd/root.go index fbd9cdf..754593f 100644 --- a/internal/commands/logscmd/root.go +++ b/internal/commands/logscmd/root.go @@ -36,7 +36,7 @@ var LogsCommand = &cobra.Command{ args = addFlagsToArgs(args) - command := externalcommand.JoinCommandSlices("docker-compose logs", args...) + command := externalcommand.JoinCommand("docker-compose logs", args...) _, err = externalcommand.Execute(command, nil, "") diff --git a/internal/commands/upcmd/root.go b/internal/commands/upcmd/root.go index efd2eeb..fabc4df 100644 --- a/internal/commands/upcmd/root.go +++ b/internal/commands/upcmd/root.go @@ -141,7 +141,7 @@ var UpCommand = &cobra.Command{ timebridger = spinnertimebridger.New("Running 'docker-compose up'", fmt.Sprintf("%sSuccessfully executed 'docker-compose up'%s", chalk.Green, chalk.ResetColor), 14, "cyan") } - command := externalcommand.JoinCommandSlices("docker-compose up -d", selectedServices...) + command := externalcommand.JoinCommand("docker-compose up -d", selectedServices...) _, err = externalcommand.Execute(command, timebridger, filepath) diff --git a/pkg/externalcommand/externalcommand.go b/pkg/externalcommand/externalcommand.go index b15adbf..12f2481 100644 --- a/pkg/externalcommand/externalcommand.go +++ b/pkg/externalcommand/externalcommand.go @@ -10,12 +10,12 @@ import ( "strings" ) -// JoinCommandSlices joins all command slices with spaces -func JoinCommandSlices(base string, arguments ...string) string { +// JoinCommand joins all command slices with spaces +func JoinCommand(command string, arguments ...string) string { if len(arguments) > 0 { - return fmt.Sprintf("%s ", base) + strings.Join(arguments, " ") + return fmt.Sprintf("%s ", command) + strings.Join(arguments, " ") } else { - return base + return command } }