Merge branch 'master' into NOJIRA-original-command-error

command/command.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"os/exec"
-	"strconv"
 	"strings"
 
 	"github.com/bitrise-io/go-utils/v2/env"
@@ -157,7 +156,7 @@ func (c command) Wait() error {
 func printableCommandArgs(isQuoteFirst bool, fullCommandArgs []string) string {
 	var cmdArgsDecorated []string
 	for idx, anArg := range fullCommandArgs {
-		quotedArg := strconv.Quote(anArg)
+		quotedArg := fmt.Sprintf("\"%s\"", anArg)
 		if idx == 0 && !isQuoteFirst {
 			quotedArg = anArg
 		}

command/command_test.go

@@ -2,11 +2,13 @@ package command
 
 import (
 	"bytes"
+	"fmt"
 	"os/exec"
 	"strings"
 	"testing"
 
 	"github.com/bitrise-io/go-utils/v2/env"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestRunErrors(t *testing.T) {
@@ -237,3 +239,13 @@ Error: fourth error`,
 		})
 	}
 }
+
+func TestSpecialCharactersAreNotEscaped(t *testing.T) {
+	programName := "test"
+	argument := `-----BEGIN PRIVATE KEY-----\nThis\nis\na\nprivate-key\n-----END PRIVATE KEY-----`
+
+	got := NewFactory(env.NewRepository()).Create(programName, []string{argument}, nil).PrintableCommandArgs()
+	expected := fmt.Sprintf("%s \"%s\"", programName, argument)
+
+	assert.Equal(t, expected, got)
+}