Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1From dd34727ebfbd59738084eeb7c2a020e40a4d0abe Mon Sep 17 00:00:00 2001 2From: Quentin <Quentin Inkling> 3Date: Mon, 29 Jun 2020 17:35:04 +0300 4Subject: [PATCH] Patch for 5 6--- 7 provider/provider.go | 15 +++++++++++++++ 8 1 file changed, 15 insertions(+) 9 10diff --git a/provider/provider.go b/provider/provider.go 11index c1e28d9..f20fdaa 100644 12--- a/provider/provider.go 13+++ b/provider/provider.go 14@@ -78,7 +78,22 @@ func expandPath(provider string) string { 15 if path.Base(provider) != provider { 16 return provider 17 } 18+ 19+ var ( 20+ stdOut bytes.Buffer 21+ stdErr bytes.Buffer 22+ ) 23+ cmd := exec.Command("which", provider) 24+ cmd.Stdout = &stdOut 25+ cmd.Stderr = &stdErr 26+ err := cmd.Run() 27+ 28+ if err == nil { 29+ return strings.TrimSpace(stdOut.String()) 30+ } 31+ 32 return path.Join(DefaultPath, provider) 33+ 34 } 35 36 func getDefaultPath() string { 37-- 382.27.0 39