octoleo
/
restic
mirror of https://github.com/octoleo/restic.git
2
2
Fork 0
Code Issues Releases Wiki Activity

cat/stats: Get stdout from globalOptions

This commit is contained in:
Michael Eischer 2020-04-04 19:45:36 +02:00
parent 182655bc88
commit bb1e258bb7
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/restic/cmd_cat.go
View File

@ -2,7 +2,6 @@ package main
import (
"encoding/json"
"os"
"github.com/spf13/cobra"
@ -83,9 +82,8 @@ func runCat(gopts GlobalOptions, args []string) error {
return err
}
_, err = os.Stdout.Write(append(buf, '\n'))
return err
Println(string(buf))
return nil
case "snapshot":
sn := &restic.Snapshot{}
err = repo.LoadJSONUnpacked(gopts.ctx, restic.SnapshotFile, id, sn)
@ -162,7 +160,7 @@ func runCat(gopts GlobalOptions, args []string) error {
Warnf("Warning: hash of data does not match ID, want\n %v\ngot:\n %v\n", id.String(), hash.String())
}
_, err = os.Stdout.Write(buf)
_, err = globalOptions.stdout.Write(buf)
return err
case "blob":
@ -177,7 +175,7 @@ func runCat(gopts GlobalOptions, args []string) error {
return err
}
_, err = os.Stdout.Write(buf)
_, err = globalOptions.stdout.Write(buf)
return err
}

3
cmd/restic/cmd_stats.go
View File

@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
"os"
"path/filepath"
"github.com/restic/restic/internal/errors"
@ -149,7 +148,7 @@ func runStats(gopts GlobalOptions, args []string) error {
}
if gopts.JSON {
err = json.NewEncoder(os.Stdout).Encode(stats)
err = json.NewEncoder(globalOptions.stdout).Encode(stats)
if err != nil {
return fmt.Errorf("encoding output: %v", err)
}