From d2b62ce34726723e8f5707a47c261dffea8eaddc Mon Sep 17 00:00:00 2001
From: Songmu <y.songmu@gmail.com>
Date: Thu, 2 Jan 2020 00:53:18 +0900
Subject: [PATCH] print command execution output to stderr

---
 cmdutil/run.go | 14 ++------------
 vcs.go         | 12 ++++++------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/cmdutil/run.go b/cmdutil/run.go
index ac098c4f..fb4709b8 100644
--- a/cmdutil/run.go
+++ b/cmdutil/run.go
@@ -13,7 +13,7 @@ import (
 // Run the command
 func Run(command string, args ...string) error {
 	cmd := exec.Command(command, args...)
-	cmd.Stdout = os.Stdout
+	cmd.Stdout = os.Stderr
 	cmd.Stderr = os.Stderr
 
 	return RunCommand(cmd, false)
@@ -31,7 +31,7 @@ func RunSilently(command string, args ...string) error {
 // RunInDir runs the command in the specified directory
 func RunInDir(dir, command string, args ...string) error {
 	cmd := exec.Command(command, args...)
-	cmd.Stdout = os.Stdout
+	cmd.Stdout = os.Stderr
 	cmd.Stderr = os.Stderr
 	cmd.Dir = dir
 
@@ -48,16 +48,6 @@ func RunInDirSilently(dir, command string, args ...string) error {
 	return RunCommand(cmd, true)
 }
 
-// RunInDirStderr run the command in the specified directory and prevent stdout output
-func RunInDirStderr(dir, command string, args ...string) error {
-	cmd := exec.Command(command, args...)
-	cmd.Stdout = os.Stderr
-	cmd.Stderr = os.Stderr
-	cmd.Dir = dir
-
-	return RunCommand(cmd, true)
-}
-
 // RunFunc for the type command execution
 type RunFunc func(*exec.Cmd) error
 
diff --git a/vcs.go b/vcs.go
index e41f2bfb..db32f9ac 100644
--- a/vcs.go
+++ b/vcs.go
@@ -85,7 +85,7 @@ var GitBackend = &VCSBackend{
 		return nil
 	},
 	Init: func(dir string) error {
-		return cmdutil.RunInDirStderr(dir, "git", "init")
+		return cmdutil.RunInDir(dir, "git", "init")
 	},
 	Contents: []string{".git"},
 }
@@ -251,7 +251,7 @@ var MercurialBackend = &VCSBackend{
 		return runInDir(vg.silent)(vg.dir, "hg", "pull", "--update")
 	},
 	Init: func(dir string) error {
-		return cmdutil.RunInDirStderr(dir, "hg", "init")
+		return cmdutil.RunInDir(dir, "hg", "init")
 	},
 	Contents: []string{".hg"},
 }
@@ -281,7 +281,7 @@ var DarcsBackend = &VCSBackend{
 		return runInDir(vg.silent)(vg.dir, "darcs", "pull")
 	},
 	Init: func(dir string) error {
-		return cmdutil.RunInDirStderr(dir, "darcs", "init")
+		return cmdutil.RunInDir(dir, "darcs", "init")
 	},
 	Contents: []string{"_darcs"},
 }
@@ -317,10 +317,10 @@ var FossilBackend = &VCSBackend{
 		return runInDir(vg.silent)(vg.dir, "fossil", "update")
 	},
 	Init: func(dir string) error {
-		if err := cmdutil.RunInDirStderr(dir, "fossil", "init", fossilRepoName); err != nil {
+		if err := cmdutil.RunInDir(dir, "fossil", "init", fossilRepoName); err != nil {
 			return err
 		}
-		return cmdutil.RunInDirStderr(dir, "fossil", "open", fossilRepoName)
+		return cmdutil.RunInDir(dir, "fossil", "open", fossilRepoName)
 	},
 	Contents: []string{".fslckout", "_FOSSIL_"},
 }
@@ -344,7 +344,7 @@ var BazaarBackend = &VCSBackend{
 		return runInDir(vg.silent)(vg.dir, "bzr", "pull", "--overwrite")
 	},
 	Init: func(dir string) error {
-		return cmdutil.RunInDirStderr(dir, "bzr", "init")
+		return cmdutil.RunInDir(dir, "bzr", "init")
 	},
 	Contents: []string{".bzr"},
 }