From 0119322e7d53826dd110968b6b1feb4bed007d88 Mon Sep 17 00:00:00 2001
From: Jochen Dick <Bobonium@users.noreply.github.com>
Date: Sat, 30 Jan 2021 16:56:50 +0100
Subject: [PATCH] Terraform 0.13.0 support (#191)

* replaced usages of terraform --version with terraform version, as terraform --version is no longer supported starting with 0.13.0

* use 'version' instead of '--version' in helper.sh for 0.13.0 compatibility

Co-authored-by: Zordrak <Zordrak@users.noreply.github.com>
---
 README.md         | 6 +++---
 lib/helpers.sh    | 4 ++--
 libexec/tfenv-use | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ed319b5..97c5071 100644
--- a/README.md
+++ b/README.md
@@ -408,7 +408,7 @@ Note, that [TFENV\_TERRAFORM\_VERSION environment variable](#tfenv_terraform_ver
 $ cat .terraform-version
 0.6.16
 
-$ terraform --version
+$ terraform version
 Terraform v0.6.16
 
 Your version of Terraform is out of date! The latest version
@@ -416,12 +416,12 @@ is 0.7.3. You can update by downloading from www.terraform.io
 
 $ echo 0.7.3 > .terraform-version
 
-$ terraform --version
+$ terraform version
 Terraform v0.7.3
 
 $ echo latest:^0.8 > .terraform-version
 
-$ terraform --version
+$ terraform version
 Terraform v0.8.8
 
 $ TFENV_TERRAFORM_VERSION=0.7.3 terraform --version
diff --git a/lib/helpers.sh b/lib/helpers.sh
index c9215cc..4b35c3f 100755
--- a/lib/helpers.sh
+++ b/lib/helpers.sh
@@ -112,14 +112,14 @@ export -f curlw;
 
 check_active_version() {
   local v="${1}";
-  [ -n "$(${TFENV_ROOT}/bin/terraform --version | grep -E "^Terraform v${v}((-dev)|( \([a-f0-9]+\)))?$")" ];
+  [ -n "$(${TFENV_ROOT}/bin/terraform version | grep -E "^Terraform v${v}((-dev)|( \([a-f0-9]+\)))?$")" ];
 }
 export -f check_active_version;
 
 check_installed_version() {
   local v="${1}";
   local bin="${TFENV_ROOT}/versions/${v}/terraform";
-  [ -n "$(${bin} --version | grep -E "^Terraform v${v}((-dev)|( \([a-f0-9]+\)))?$")" ];
+  [ -n "$(${bin} version | grep -E "^Terraform v${v}((-dev)|( \([a-f0-9]+\)))?$")" ];
 };
 export -f check_installed_version;
 
diff --git a/libexec/tfenv-use b/libexec/tfenv-use
index 6d2b687..df5abd8 100755
--- a/libexec/tfenv-use
+++ b/libexec/tfenv-use
@@ -109,6 +109,6 @@ if [ "${version_file}" != "$(tfenv-version-file)" ]; then
   log 'warn' "Default version file overridden by $(tfenv-version-file), changing the default version has no effect";
 fi;
 
-terraform --version 1>/dev/null \
-  || log 'error' "'terraform --version' failed. Something is seriously wrong";
+terraform version 1>/dev/null \
+  || log 'error' "'terraform version' failed. Something is seriously wrong";
 log 'info' "Switching completed";