Skip to content

Commit

Permalink
Merge branch 'master' into add-init-command
Browse files Browse the repository at this point in the history
  • Loading branch information
Zordrak authored Feb 6, 2021
2 parents fec2848 + 44a68eb commit 30efaad
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions libexec/tfenv-min-required
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ see https://www.terraform.io/docs/configuration/terraform.html for details';
find_min_required() {
local root="${1}";

# Only grep recursively if we cannot a required version in base of directory
versions="$( echo $(grep -h required_version --include '*tf' "${root}"/* || grep -h -R required_version --include '*tf' "${root}"/*) | grep -o '\([0-9]\+\.\?\)\{2,3\}\(-[a-z]\+[0-9]\+\)\?')";
versions="$( echo $(grep -h required_version "${root}"/*.tf 2>/dev/null ) | grep -o '\([0-9]\+\.\?\)\{2,3\}\(-[a-z]\+[0-9]\+\)\?')";

if [[ "${versions}" =~ ([~=!<>]{0,2}[[:blank:]]*[0-9]+[0-9.]+)[^0-9]*(-[a-z]+[0-9]+)? ]]; then
found_min_required="${BASH_REMATCH[1]}${BASH_REMATCH[2]}"
Expand Down

0 comments on commit 30efaad

Please sign in to comment.