diff --git a/core/commands/ipns.go b/core/commands/ipns.go index 591286914..a1ca1417b 100644 --- a/core/commands/ipns.go +++ b/core/commands/ipns.go @@ -121,7 +121,7 @@ Resolve the value of another name: if !ok { return nil, u.ErrCast() } - return strings.NewReader(output.Path.String()), nil + return strings.NewReader(output.Path.String() + "\n"), nil }, }, Type: ResolvedPath{}, diff --git a/core/commands/object.go b/core/commands/object.go index 2b6a1494e..e2e8b3167 100644 --- a/core/commands/object.go +++ b/core/commands/object.go @@ -371,7 +371,7 @@ and then run Marshalers: cmds.MarshalerMap{ cmds.Text: func(res cmds.Response) (io.Reader, error) { object := res.Output().(*Object) - return strings.NewReader("added " + object.Hash), nil + return strings.NewReader("added " + object.Hash + "\n"), nil }, }, Type: Object{}, diff --git a/core/commands/resolve.go b/core/commands/resolve.go index f6ad91eae..9eaa590df 100644 --- a/core/commands/resolve.go +++ b/core/commands/resolve.go @@ -117,7 +117,7 @@ Resolve the value of an IPFS DAG path: if !ok { return nil, u.ErrCast() } - return strings.NewReader(output.Path.String()), nil + return strings.NewReader(output.Path.String() + "\n"), nil }, }, Type: ResolvedPath{}, diff --git a/core/commands/tar.go b/core/commands/tar.go index 0d6fc1318..7b84ac5f1 100644 --- a/core/commands/tar.go +++ b/core/commands/tar.go @@ -67,7 +67,7 @@ var tarAddCmd = &cmds.Command{ Marshalers: cmds.MarshalerMap{ cmds.Text: func(res cmds.Response) (io.Reader, error) { o := res.Output().(*AddedObject) - return strings.NewReader(o.Hash), nil + return strings.NewReader(o.Hash + "\n"), nil }, }, } diff --git a/test/sharness/t0051-object.sh b/test/sharness/t0051-object.sh index cc612addd..ec97e39a2 100755 --- a/test/sharness/t0051-object.sh +++ b/test/sharness/t0051-object.sh @@ -66,7 +66,7 @@ test_object_cmd() { test_expect_success "'ipfs object put file.json' output looks good" ' HASH="QmUTSAdDi2xsNkDtLqjFgQDMEn5di3Ab9eqbrt4gaiNbUD" && - printf "added $HASH" > expected_putOut && + printf "added $HASH\n" > expected_putOut && test_cmp expected_putOut actual_putOut ' @@ -76,7 +76,7 @@ test_object_cmd() { test_expect_success "'ipfs object put file.xml' output looks good" ' HASH="QmQzNKUHy4HyEUGkqKe3q3t796ffPLQXYCkHCcXUNT5JNK" && - printf "added $HASH" > expected_putOut && + printf "added $HASH\n" > expected_putOut && test_cmp expected_putOut actual_putOut ' @@ -103,7 +103,7 @@ test_object_cmd() { ' test_expect_failure "'ipfs object put --inputenc=xml' output looks good" ' - echo "added $HASH" >expected && + echo "added $HASH\n" >expected && test_cmp expected actual ' @@ -113,7 +113,7 @@ test_object_cmd() { test_expect_success "'ipfs object put file.pb' output looks good" ' HASH="QmUTSAdDi2xsNkDtLqjFgQDMEn5di3Ab9eqbrt4gaiNbUD" && - printf "added $HASH" > expected_putOut && + printf "added $HASH\n" > expected_putOut && test_cmp expected_putOut actual_putOut ' @@ -123,7 +123,7 @@ test_object_cmd() { test_expect_success "'ipfs object put' from stdin output looks good" ' HASH="QmUTSAdDi2xsNkDtLqjFgQDMEn5di3Ab9eqbrt4gaiNbUD" && - printf "added $HASH" > expected_putStdinOut && + printf "added $HASH\n" > expected_putStdinOut && test_cmp expected_putStdinOut actual_putStdinOut ' @@ -133,7 +133,7 @@ test_object_cmd() { test_expect_success "'ipfs object put' from stdin (pb) output looks good" ' HASH="QmUTSAdDi2xsNkDtLqjFgQDMEn5di3Ab9eqbrt4gaiNbUD" && - printf "added $HASH" > expected_putStdinOut && + printf "added $HASH\n" > expected_putStdinOut && test_cmp expected_putStdinOut actual_putPbStdinOut ' diff --git a/test/sharness/t0100-name.sh b/test/sharness/t0100-name.sh index f4c2cf269..688dcbd1e 100755 --- a/test/sharness/t0100-name.sh +++ b/test/sharness/t0100-name.sh @@ -28,7 +28,7 @@ test_expect_success "'ipfs name resolve' succeeds" ' ' test_expect_success "resolve output looks good" ' - printf "/ipfs/%s" "$HASH_WELCOME_DOCS" >expected2 && + printf "/ipfs/%s\n" "$HASH_WELCOME_DOCS" >expected2 && test_cmp expected2 output ' @@ -50,7 +50,7 @@ test_expect_success "'ipfs name resolve' succeeds" ' ' test_expect_success "resolve output looks good" ' - printf "/ipfs/%s/help" "$HASH_WELCOME_DOCS" >expected4 && + printf "/ipfs/%s/help\n" "$HASH_WELCOME_DOCS" >expected4 && test_cmp expected4 output ' diff --git a/test/sharness/t0160-resolve.sh b/test/sharness/t0160-resolve.sh index 02b457c54..1642d51aa 100755 --- a/test/sharness/t0160-resolve.sh +++ b/test/sharness/t0160-resolve.sh @@ -20,7 +20,7 @@ test_resolve_setup_name() { test_expect_success "resolve: prepare name" ' id_hash=$(ipfs id -f="") && ipfs name publish "$ref" && - printf "$ref" >expected_nameval && + printf "$ref\n" >expected_nameval && ipfs name resolve >actual_nameval && test_cmp expected_nameval actual_nameval ' @@ -47,7 +47,7 @@ test_resolve() { ' test_expect_success "resolved correctly: $src -> $dst" ' - printf "$dst" >expected && + printf "$dst\n" >expected && test_cmp expected actual ' } diff --git a/test/sharness/t0240-republisher.sh b/test/sharness/t0240-republisher.sh index c1db0fbd3..71764ae96 100755 --- a/test/sharness/t0240-republisher.sh +++ b/test/sharness/t0240-republisher.sh @@ -64,7 +64,7 @@ verify_can_resolve() { ' test_expect_success "output looks right" ' - printf "/ipfs/$expected" > expected && + printf "/ipfs/$expected\n" > expected && test_cmp expected resolve ' }