浏览代码

Move sudoloop code to exec.go

morganamilo 6 年之前
父节点
当前提交
257653047b
共有 2 个文件被更改,包括 24 次插入27 次删除
  1. 0 27
      cmd.go
  2. 24 0
      exec.go

+ 0 - 27
cmd.go

@@ -4,9 +4,7 @@ import (
 	"bufio"
 	"fmt"
 	"os"
-	"os/exec"
 	"strconv"
-	"time"
 )
 
 var cmdArgs = makeArguments()
@@ -118,31 +116,6 @@ If no arguments are provided 'yay -Syu' will be performed
 If no operation is provided -Y will be assumed`)
 }
 
-func sudoLoopBackground() {
-	updateSudo()
-	go sudoLoop()
-}
-
-func sudoLoop() {
-	for {
-		updateSudo()
-		time.Sleep(298 * time.Second)
-	}
-}
-
-func updateSudo() {
-	for {
-		cmd := exec.Command("sudo", "-v")
-		cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
-		err := cmd.Run()
-		if err != nil {
-			fmt.Println(err)
-		} else {
-			break
-		}
-	}
-}
-
 func handleCmd() (err error) {
 	for option, value := range cmdArgs.options {
 		if handleConfig(option, value) {

+ 24 - 0
exec.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+	"time"
 )
 
 func show(cmd *exec.Cmd) error {
@@ -29,6 +30,29 @@ func capture(cmd *exec.Cmd) (string, string, error) {
 	return stdout, stderr, err
 }
 
+func sudoLoopBackground() {
+	updateSudo()
+	go sudoLoop()
+}
+
+func sudoLoop() {
+	for {
+		updateSudo()
+		time.Sleep(298 * time.Second)
+	}
+}
+
+func updateSudo() {
+	for {
+		err := show(exec.Command("sudo", "-v"))
+		if err != nil {
+			fmt.Println(err)
+		} else {
+			break
+		}
+	}
+}
+
 func passToPacman(args *arguments) *exec.Cmd {
 	argArr := make([]string, 0)