Merge pull request #101 from arangodb-helper/usr_local_sbin

ewoutp · web-flow · commit 301d3a14d0c7 · 2017-11-14T09:28:02.000+01:00
On linux, also look for arangod in /usr/local/sbin
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - Support building in a directory other than the source directory. Set `BUILDDIR` (#98).
 - Testing a server instance now includes testing for the expected server role.
+- On linux, also look for `arangod` in `/usr/local/sbin` (#93).
 
 # Changes from version 0.10.1 to 0.10.2
 
diff --git a/main.go b/main.go
@@ -304,6 +304,7 @@ func findExecutable() {
 	case "linux":
 		pathList = append(pathList,
 			"/usr/sbin/arangod",
+			"/usr/local/sbin/arangod",
 		)
 	}
 	// Add local folder to search path

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,7 @@ func findExecutable() {`
`304`	`304`	`case "linux":`
`305`	`305`	`pathList = append(pathList,`
`306`	`306`	`"/usr/sbin/arangod",`
	`307`	`+ "/usr/local/sbin/arangod",`
`307`	`308`	`)`
`308`	`309`	`}`
`309`	`310`	`// Add local folder to search path`