Skip to content

Commit 42cf115

Browse files
committed
Write to os.Stdout
1 parent eca52c5 commit 42cf115

File tree

3 files changed

+26
-23
lines changed

3 files changed

+26
-23
lines changed

cmd/get.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,36 +32,36 @@ func Get(args []string) int {
3232
// Parse args
3333
args, flags, err := cmd.parseArgs(args)
3434
if err != nil {
35-
fmt.Fprintln(os.Stderr, err.Error())
35+
fmt.Println(err.Error())
3636
return 10
3737
}
3838

3939
// Read lock.json
4040
lockJSON, err := lockjson.Read()
4141
if err != nil {
42-
fmt.Fprintln(os.Stderr, "[ERROR] Could not read lock.json: "+err.Error())
42+
fmt.Println("[ERROR] Could not read lock.json: " + err.Error())
4343
return 11
4444
}
4545

4646
reposPathList, err := cmd.getReposPathList(flags, args, lockJSON)
4747
if err != nil {
48-
fmt.Fprintln(os.Stderr, "[ERROR] Could not get repos list: "+err.Error())
48+
fmt.Println("[ERROR] Could not get repos list: " + err.Error())
4949
return 12
5050
}
5151

5252
// Check if any repositories are dirty
5353
for _, reposPath := range reposPathList {
5454
fullpath := pathutil.FullReposPathOf(reposPath)
5555
if cmd.pathExists(fullpath) && cmd.isDirtyWorktree(fullpath) {
56-
fmt.Fprintln(os.Stderr, "[ERROR] Repository has dirty worktree: "+fullpath)
56+
fmt.Println("[ERROR] Repository has dirty worktree: " + fullpath)
5757
return 13
5858
}
5959
}
6060

6161
// Begin transaction
6262
err = transaction.Create()
6363
if err != nil {
64-
fmt.Fprintln(os.Stderr, "[ERROR] Failed to begin transaction: "+err.Error())
64+
fmt.Println("[ERROR] Failed to begin transaction: " + err.Error())
6565
return 14
6666
}
6767
defer transaction.Remove()
@@ -77,7 +77,7 @@ func Get(args []string) int {
7777
// Get HEAD hash string
7878
hash, err := cmd.getHEADHashString(reposPath)
7979
if err != nil {
80-
fmt.Fprintln(os.Stderr, "[ERROR] Failed to get HEAD commit hash: "+err.Error())
80+
fmt.Println("[ERROR] Failed to get HEAD commit hash: " + err.Error())
8181
continue
8282
}
8383
// Update repos[]/trx_id, repos[]/version
@@ -88,24 +88,24 @@ func Get(args []string) int {
8888
upgradedList = append(upgradedList, reposPath)
8989
}
9090
} else {
91-
fmt.Fprintln(os.Stderr, "[ERROR] Failed to install / upgrade plugins: "+err.Error())
91+
fmt.Println("[ERROR] Failed to install / upgrade plugins: " + err.Error())
9292
}
9393
}
9494

9595
if updatedLockJSON {
9696
err = lockjson.Write(lockJSON)
9797
if err != nil {
98-
fmt.Fprintln(os.Stderr, "[ERROR] Could not write to lock.json: "+err.Error())
98+
fmt.Println("[ERROR] Could not write to lock.json: " + err.Error())
9999
return 15
100100
}
101101
}
102102

103103
// Show upgraded plugins
104104
if len(upgradedList) > 0 {
105-
fmt.Fprintln(os.Stderr, "[WARN] Reloading upgraded plugin is not supported.")
106-
fmt.Fprintln(os.Stderr, "[WARN] Please restart your Vim to reload the following plugins:")
105+
fmt.Println("[WARN] Reloading upgraded plugin is not supported.")
106+
fmt.Println("[WARN] Please restart your Vim to reload the following plugins:")
107107
for _, reposPath := range upgradedList {
108-
fmt.Fprintln(os.Stderr, "[WARN] "+reposPath)
108+
fmt.Println("[WARN] " + reposPath)
109109
}
110110
}
111111

@@ -115,8 +115,9 @@ func Get(args []string) int {
115115
func (getCmd) parseArgs(args []string) ([]string, *getFlags, error) {
116116
var flags getFlags
117117
fs := flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
118+
fs.SetOutput(os.Stdout)
118119
fs.Usage = func() {
119-
fmt.Fprintln(os.Stderr, `
120+
fmt.Println(`
120121
Usage
121122
volt get [-help] [-l] [-u] [-v] [{repository} ...]
122123
@@ -125,7 +126,7 @@ Description
125126
126127
Options`)
127128
fs.PrintDefaults()
128-
fmt.Fprintln(os.Stderr)
129+
fmt.Println()
129130
}
130131
fs.BoolVar(&flags.lockJSON, "l", false, "from lock.json")
131132
fs.BoolVar(&flags.upgrade, "u", false, "upgrade installed vim plugin")

cmd/query.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,28 @@ func Query(args []string) int {
2323

2424
args, flags, err := cmd.parseArgs(args)
2525
if err != nil {
26-
fmt.Fprintln(os.Stderr, err.Error())
26+
fmt.Println(err.Error())
2727
return 10
2828
}
2929

3030
// Read lock.json
3131
lockJSON, err := lockjson.Read()
3232
if err != nil {
33-
fmt.Fprintln(os.Stderr, "[ERROR] Failed to read lock.json: "+err.Error())
33+
fmt.Println("[ERROR] Failed to read lock.json: " + err.Error())
3434
return 11
3535
}
3636

3737
reposPathList, err := cmd.getReposPathList(flags, args, lockJSON)
3838
if err != nil {
39-
fmt.Fprintln(os.Stderr, err.Error())
39+
fmt.Println(err.Error())
4040
return 12
4141
}
4242

4343
reposList := make([]lockjson.Repos, 0, len(reposPathList))
4444
for _, reposPath := range reposPathList {
4545
repos, err := cmd.lookUpRepos(reposPath, lockJSON)
4646
if err != nil {
47-
fmt.Fprintln(os.Stderr, "Failed to look up '"+reposPath+"': "+err.Error())
47+
fmt.Println("Failed to look up '" + reposPath + "': " + err.Error())
4848
return 13
4949
}
5050
reposList = append(reposList, *repos)
@@ -58,8 +58,9 @@ func Query(args []string) int {
5858
func (queryCmd) parseArgs(args []string) ([]string, *queryFlags, error) {
5959
var flags queryFlags
6060
fs := flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
61+
fs.SetOutput(os.Stdout)
6162
fs.Usage = func() {
62-
fmt.Fprintln(os.Stderr, `
63+
fmt.Println(`
6364
Usage
6465
volt query [-help] [-j] [-i] [{repository}]
6566
@@ -68,7 +69,7 @@ Description
6869
6970
Options`)
7071
fs.PrintDefaults()
71-
fmt.Fprintln(os.Stderr)
72+
fmt.Println()
7273
}
7374
fs.BoolVar(&flags.json, "j", false, "output as JSON")
7475
fs.BoolVar(&flags.installed, "i", false, "show installed info")

cmd/rm.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ func Rm(args []string) int {
2121

2222
reposPath, flags, err := cmd.parseArgs(args)
2323
if err != nil {
24-
fmt.Fprintln(os.Stderr, err.Error())
24+
fmt.Println(err.Error())
2525
return 10
2626
}
2727

2828
err = cmd.removeRepos(reposPath, flags)
2929
if err != nil {
30-
fmt.Fprintln(os.Stderr, "Failed to clone repository: "+err.Error())
30+
fmt.Println("Failed to clone repository: " + err.Error())
3131
return 11
3232
}
3333

@@ -37,8 +37,9 @@ func Rm(args []string) int {
3737
func (rmCmd) parseArgs(args []string) (string, *rmFlags, error) {
3838
var flags rmFlags
3939
fs := flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
40+
fs.SetOutput(os.Stdout)
4041
fs.Usage = func() {
41-
fmt.Fprintln(os.Stderr, `
42+
fmt.Println(`
4243
Usage
4344
volt rm [-help] [-p] {repository}
4445
@@ -47,7 +48,7 @@ Description
4748
4849
Options`)
4950
fs.PrintDefaults()
50-
fmt.Fprintln(os.Stderr)
51+
fmt.Println()
5152
}
5253
fs.BoolVar(&flags.removePlugConf, "p", false, "Remove plugconf")
5354
fs.Parse(args)

0 commit comments

Comments
 (0)