fix(daemon): fix daemon unable to find mock + verification service wh…

…en called from $PATH
ray-xu-deltatre · Jun 11, 2016 · 879a3b4 · 879a3b4
1 parent 0ea229b
commit 879a3b4
Show file tree

Hide file tree

Showing 37 changed files with 8,165 additions and 3 deletions.
diff --git a/daemon/pact_mock_service.go b/daemon/pact_mock_service.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/kardianos/osext"
 	"github.com/pact-foundation/pact-go/utils"
 )
 
@@ -35,6 +36,6 @@ func (m *PactMockService) NewService(args []string) (int, Service) {
 }
 
 func getMockServiceCommandPath() string {
-	dir, _ := os.Getwd()
+	dir, _ := osext.ExecutableFolder()
 	return fmt.Sprintf(filepath.Join(dir, "pact-mock-service", "bin", "pact-mock-service"))
 }
diff --git a/daemon/verification_service.go b/daemon/verification_service.go
@@ -3,8 +3,9 @@ package daemon
 import (
 	"fmt"
 	"log"
-	"os"
 	"path/filepath"
+
+	"github.com/kardianos/osext"
 )
 
 // VerificationService is a wrapper for the Pact Provider Verifier Service.
@@ -30,6 +31,6 @@ func (m *VerificationService) NewService(args []string) (int, Service) {
 }
 
 func getVerifierCommandPath() string {
-	dir, _ := os.Getwd()
+	dir, _ := osext.ExecutableFolder()
 	return fmt.Sprintf(filepath.Join(dir, "pact-provider-verifier", "bin", "pact-provider-verifier"))
 }
diff --git a/vendor/github.com/kardianos/osext/LICENSE b/vendor/github.com/kardianos/osext/LICENSE
diff --git a/vendor/github.com/kardianos/osext/README.md b/vendor/github.com/kardianos/osext/README.md
diff --git a/vendor/github.com/kardianos/osext/osext.go b/vendor/github.com/kardianos/osext/osext.go
diff --git a/vendor/github.com/kardianos/osext/osext_plan9.go b/vendor/github.com/kardianos/osext/osext_plan9.go
diff --git a/vendor/github.com/kardianos/osext/osext_procfs.go b/vendor/github.com/kardianos/osext/osext_procfs.go
diff --git a/vendor/github.com/kardianos/osext/osext_sysctl.go b/vendor/github.com/kardianos/osext/osext_sysctl.go