浏览代码

Move passToPackman from config.go to cmd.go

morganamilo 7 年之前
父节点
当前提交
68a9771327
共有 2 个文件被更改,包括 21 次插入20 次删除
  1. 20 0
      cmd.go
  2. 1 20
      config.go

+ 20 - 0
cmd.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -488,3 +489,22 @@ func complete() error {
 	_, err = io.Copy(os.Stdout, in)
 	return err
 }
+
+// PassToPacman outsorces execution to pacman binary without modifications.
+func passToPacman(parser *argParser) error {
+	var cmd *exec.Cmd
+	args := make([]string, 0)
+
+	if parser.needRoot() {
+		args = append(args, "sudo")
+	}
+
+	args = append(args, "pacman")
+	args = append(args, parser.formatArgs()...)
+
+	cmd = exec.Command(args[0], args[1:]...)
+
+	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+	err := cmd.Run()
+	return err
+}

+ 1 - 20
config.go

@@ -194,23 +194,4 @@ func continueTask(s string, def string) (cont bool) {
 	}
 
 	return true
-}
-
-// PassToPacman outsorces execution to pacman binary without modifications.
-func passToPacman(parser *argParser) error {
-	var cmd *exec.Cmd
-	args := make([]string, 0)
-	
-	if parser.needRoot() {
-		args = append(args, "sudo")
-	}
-	
-	args = append(args, "pacman")
-	args = append(args, parser.formatArgs()...)
-	
-	cmd = exec.Command(args[0], args[1:]...)
-
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
-	err := cmd.Run()
-	return err
-}
+}