Add folder containing executable to search path for arangod

ewoutp · ewoutp · commit d7a2ef86ebb7 · 2017-06-13T12:11:07.000+02:00
diff --git a/main.go b/main.go
@@ -281,6 +281,13 @@ func findExecutable() {
 			"/usr/sbin/arangod",
 		)
 	}
+	// Add local folder to search path
+	if exePath, err := os.Executable(); err == nil {
+		folder := filepath.Dir(exePath)
+		pathList = append(pathList, filepath.Join(folder, "arangod"+filepath.Ext(exePath)))
+	}
+
+	// Search to search path for the first path that exists.
 	for _, p := range pathList {
 		if _, e := os.Stat(filepath.Clean(filepath.FromSlash(p))); e == nil || !os.IsNotExist(e) {
 			arangodPath, _ = filepath.Abs(filepath.FromSlash(p))

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,13 @@ func findExecutable() {`
`281`	`281`	`"/usr/sbin/arangod",`
`282`	`282`	`)`
`283`	`283`	`}`
	`284`	`+ // Add local folder to search path`
	`285`	`+ if exePath, err := os.Executable(); err == nil {`
	`286`	`+ folder := filepath.Dir(exePath)`
	`287`	`+ pathList = append(pathList, filepath.Join(folder, "arangod"+filepath.Ext(exePath)))`
	`288`	`+ }`
	`289`	`+`
	`290`	`+ // Search to search path for the first path that exists.`
`284`	`291`	`for _, p := range pathList {`
`285`	`292`	`if _, e := os.Stat(filepath.Clean(filepath.FromSlash(p))); e == nil \|\| !os.IsNotExist(e) {`
`286`	`293`	`arangodPath, _ = filepath.Abs(filepath.FromSlash(p))`