Merge pull request #3 from gruntwork-io/fix-os-is-amazon-linux

eak12913 · web-flow · commit f3349c40d16c · 2018-05-01T21:14:55.000-04:00
Update grep to work for both Amazon 1&amp;2 images
diff --git a/modules/bash-commons/src/os.sh b/modules/bash-commons/src/os.sh
@@ -13,7 +13,7 @@ function os_get_available_memory_mb {
 # can use regex. If you don't care about the version, leave it unspecified.
 function os_is_amazon_linux {
   local readonly version="$1"
-  grep -q "Amazon Linux release $version" /etc/*release
+  grep -q "Amazon Linux * $version" /etc/*release
 }
 
 # Returns true (0) if this is an Ubuntu server at the given version or false (1) otherwise. The version number

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ function os_get_available_memory_mb {`
`13`	`13`	`# can use regex. If you don't care about the version, leave it unspecified.`
`14`	`14`	`function os_is_amazon_linux {`
`15`	`15`	`local readonly version="$1"`
`16`		`- grep -q "Amazon Linux release $version" /etc/*release`
	`16`	`+ grep -q "Amazon Linux * $version" /etc/*release`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`# Returns true (0) if this is an Ubuntu server at the given version or false (1) otherwise. The version number`