From 9aaf2a6d9a33416ed55798a7eb60f78bd9195352 Mon Sep 17 00:00:00 2001
From: Mura Li <mura_li@castech.com.tw>
Date: Sun, 27 Nov 2016 10:10:08 +0800
Subject: [PATCH] modules/process: add ExecDirEnv (next to ExecDir)
Add a sibling to ExecDir which is capable of specifying environment variables,
so that we can invoke `git` with GIT_INDEX_FILE, GIT_DIR, etc..
For #258
---
modules/process/manager.go | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/modules/process/manager.go b/modules/process/manager.go
index 2748c14bb4..0d5416ec13 100644
--- a/modules/process/manager.go
+++ b/modules/process/manager.go
@@ -52,11 +52,11 @@ func Add(desc string, cmd *exec.Cmd) int64 {
return pid
}
-// ExecDir runs a command in given path and waits for its completion
+// ExecDirEnv runs a command in given path and environment variables, and waits for its completion
// up to the given timeout (or DefaultTimeout if -1 is given).
// Returns its complete stdout and stderr
// outputs and an error, if any (including timeout)
-func ExecDir(timeout time.Duration, dir, desc, cmdName string, args ...string) (string, string, error) {
+func ExecDirEnv(timeout time.Duration, dir, desc string, env []string, cmdName string, args ...string) (string, string, error) {
if timeout == -1 {
timeout = DefaultTimeout
}
@@ -66,6 +66,7 @@ func ExecDir(timeout time.Duration, dir, desc, cmdName string, args ...string) (
cmd := exec.Command(cmdName, args...)
cmd.Dir = dir
+ cmd.Env = env
cmd.Stdout = bufOut
cmd.Stderr = bufErr
if err := cmd.Start(); err != nil {
@@ -93,6 +94,11 @@ func ExecDir(timeout time.Duration, dir, desc, cmdName string, args ...string) (
return bufOut.String(), bufErr.String(), err
}
+// ExecDir works exactly like ExecDirEnv except no environment variable is provided.
+func ExecDir(timeout time.Duration, dir, desc, cmdName string, args ...string) (string, string, error) {
+ return ExecDirEnv(timeout, dir, desc, nil, cmdName, args...)
+}
+
// ExecTimeout runs a command and waits for its completion
// up to the given timeout (or DefaultTimeout if -1 is given).
// Returns its complete stdout and stderr