Make external commands extend the environment.

This lets user override `HTTP_PROXY` environment (for instance).

Make external commands extend the environment.
This lets user override `HTTP_PROXY` environment (for instance).
0849e63b · NLR · bd62278b · 0849e63b
Commit 0849e63b authored May 31, 2018 by NLR
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

internal/artifacts/entry.go internal/artifacts/entry.go +4 -4

No files found.
--- a/internal/artifacts/entry.go
+++ b/internal/artifacts/entry.go
@@ -67,10 +67,10 @@ func unpackFileFromZip(archivePath, encodedFilename string, headers http.Header,
 	}
 	catFile := exec.Command("gitlab-zip-cat")
-	catFile.Env = []string{
+	catFile.Env = append(os.Environ(),
-		"ARCHIVE_PATH=" + archivePath,
+		"ARCHIVE_PATH="+archivePath,
-		"ENCODED_FILE_NAME=" + encodedFilename,
+		"ENCODED_FILE_NAME="+encodedFilename,
-	}
+	)
 	catFile.Stderr = os.Stderr
 	catFile.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 	stdout, err := catFile.StdoutPipe()