Skip to content
This repository has been archived by the owner on Jun 9, 2022. It is now read-only.

Commit

Permalink
rename func from JoinCommandSlices to JoinCommand
Browse files Browse the repository at this point in the history
  • Loading branch information
martinnirtl committed Feb 8, 2020
1 parent a9f98fc commit e7a4958
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion internal/commands/logscmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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, "")

Expand Down
2 changes: 1 addition & 1 deletion internal/commands/upcmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 4 additions & 4 deletions pkg/externalcommand/externalcommand.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down

0 comments on commit e7a4958

Please sign in to comment.