From 97542ada36931da78b8857dcf4187c8fded81dbf Mon Sep 17 00:00:00 2001
From: Dicky Moore <dicky.moore@iairgroup.com>
Date: Wed, 30 Apr 2025 09:49:54 +0100
Subject: [PATCH] Strip CR carriage returns when reading .terraform-version
 (fixes #392)

---
 lib/tfenv-version-name.sh     | 2 +-
 libexec/tfenv-resolve-version | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tfenv-version-name.sh b/lib/tfenv-version-name.sh
index 3975769..befb2c7 100644
--- a/lib/tfenv-version-name.sh
+++ b/lib/tfenv-version-name.sh
@@ -10,7 +10,7 @@ function tfenv-version-name() {
       && log 'debug' "TFENV_VERSION_FILE retrieved from tfenv-version-file: ${TFENV_VERSION_FILE}" \
       || log 'error' 'Failed to retrieve TFENV_VERSION_FILE from tfenv-version-file';
 
-    TFENV_VERSION="$(cat "${TFENV_VERSION_FILE}" || true)" \
+    TFENV_VERSION="$(tr -d '\r' < "${TFENV_VERSION_FILE}" || true)" \
       && log 'debug' "TFENV_VERSION specified in TFENV_VERSION_FILE: ${TFENV_VERSION}";
 
     TFENV_VERSION_SOURCE="${TFENV_VERSION_FILE}";
diff --git a/libexec/tfenv-resolve-version b/libexec/tfenv-resolve-version
index 69468e5..b4badd3 100755
--- a/libexec/tfenv-resolve-version
+++ b/libexec/tfenv-resolve-version
@@ -77,12 +77,12 @@ if [ -z "${arg}" -a -z "${TFENV_TERRAFORM_VERSION:-""}" ]; then
 
   if [ "${version_file}" != "${TFENV_CONFIG_DIR}/version" ]; then
     log 'debug' "Version File (${version_file}) is not the default \${TFENV_CONFIG_DIR}/version (${TFENV_CONFIG_DIR}/version)";
-    version_requested="$(cat "${version_file}")" \
+    version_requested="$(tr -d '\r' < "${version_file}")" \
       || log 'error' "Failed to open ${version_file}";
 
   elif [ -f "${version_file}" ]; then
     log 'debug' "Version File is the default \${TFENV_CONFIG_DIR}/version (${TFENV_CONFIG_DIR}/version)";
-    version_requested="$(cat "${version_file}")" \
+    version_requested="$(tr -d '\r' < "${version_file}")" \
       || log 'error' "Failed to open ${version_file}";
 
     # Absolute fallback