Merge pull request #745 from hashicorp/b-rkt-version-regex

dadgar · dadgar · commit 7400bc0c23d7 · 2016-02-02T15:55:50.000-08:00
Update Rkt regex to determine version
diff --git a/client/driver/rkt.go b/client/driver/rkt.go
@@ -24,8 +24,8 @@ import (
 )
 
 var (
-	reRktVersion  = regexp.MustCompile(`rkt version (\d[.\d]+)`)
-	reAppcVersion = regexp.MustCompile(`appc version (\d[.\d]+)`)
+	reRktVersion  = regexp.MustCompile(`rkt [vV]ersion[:]? (\d[.\d]+)`)
+	reAppcVersion = regexp.MustCompile(`appc [vV]ersion[:]? (\d[.\d]+)`)
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ import (`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`var (`
`27`		- reRktVersion = regexp.MustCompile(`rkt version (\d[.\d]+)`)
`28`		- reAppcVersion = regexp.MustCompile(`appc version (\d[.\d]+)`)
	`27`	+ reRktVersion = regexp.MustCompile(`rkt [vV]ersion[:]? (\d[.\d]+)`)
	`28`	+ reAppcVersion = regexp.MustCompile(`appc [vV]ersion[:]? (\d[.\d]+)`)
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`const (`