make command runner configurable (#196)

Co-authored-by: knqyf263 <[email protected]>
knqyf263 · May 8, 2023 · 9b3e0fa · 9b3e0fa
1 parent 803bc98
commit 9b3e0fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/cmd/util.go b/cmd/util.go
@@ -23,13 +23,12 @@ func editFile(command, file string) error {
 func run(command string, r io.Reader, w io.Writer) error {
 	var cmd *exec.Cmd
 	if len(config.Conf.General.Cmd) > 0 {
-		cmd = exec.Command(config.Conf.General.Cmd[0], append(config.Conf.General.Cmd[1:], command)...)
+		line := append(config.Conf.General.Cmd, command)
+		cmd = exec.Command(line[0], line[1:]...)
+	} else if runtime.GOOS == "windows" {
+		cmd = exec.Command("cmd", "/c", command)
 	} else {
-		if runtime.GOOS == "windows" {
-			cmd = exec.Command("cmd", "/c", command)
-		} else {
-			cmd = exec.Command("sh", "-c", command)
-		}
+		cmd = exec.Command("sh", "-c", command)
 	}
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = w

diff --git a/config/config.go b/config/config.go
@@ -6,6 +6,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+
 	"github.com/BurntSushi/toml"
 	"github.com/pkg/errors"
 )
@@ -15,9 +16,9 @@ var Conf Config
 
 // Config is a struct of config
 type Config struct {
-	General GeneralConfig 	`toml:"General"`
-	Gist    GistConfig		`toml:"Gist"`
-	GitLab  GitLabConfig	`toml:"GitLab"`
+	General GeneralConfig `toml:"General"`
+	Gist    GistConfig    `toml:"Gist"`
+	GitLab  GitLabConfig  `toml:"GitLab"`
 }
 
 // GeneralConfig is a struct of general config