Refactor version file parsing to own function

Author: OJFord

lib/helpers.sh

@@ -153,6 +153,7 @@ export -f check_dependencies;
 
 source "$TFENV_ROOT/lib/tfenv-exec.sh";
 source "$TFENV_ROOT/lib/tfenv-min-required.sh";
+source "$TFENV_ROOT/lib/tfenv-parse-version-file.sh";
 source "$TFENV_ROOT/lib/tfenv-version-file.sh";
 source "$TFENV_ROOT/lib/tfenv-version-name.sh";
 

lib/tfenv-parse-version-file.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -uo pipefail;
+
+# Ensure GNU grep
+check_dependencies;
+
+function tfenv-parse-version-file() {
+  local version_file="$1"
+  log 'debug' "Parsing version from file ${version_file}"
+
+  grep --invert-match '^#' "${version_file}";
+}
+export -f tfenv-parse-version-file;

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="$(grep --invert-match '^#' "${TFENV_VERSION_FILE}" || true)" \
+    TFENV_VERSION="$(tfenv-parse-version-file "${TFENV_VERSION_FILE}")" \
       && log 'debug' "TFENV_VERSION specified in TFENV_VERSION_FILE: ${TFENV_VERSION}";
 
     TFENV_VERSION_SOURCE="${TFENV_VERSION_FILE}";

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="$(grep --invert-match '^#' "${version_file}")" \
+    version_requested="$(tfenv-parse-version-file "${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="$(grep --invert-match '^#' "${version_file}")" \
+    version_requested="$(tfenv-parse-version-file "${version_file}")" \
       || log 'error' "Failed to open ${version_file}";
 
     # Absolute fallback

libexec/tfenv-uninstall

@@ -69,11 +69,11 @@ if [ -z "${arg:-""}" -a -z "${TFENV_TERRAFORM_VERSION:-""}" ]; then
   log 'debug' "Version File: ${version_file}";
   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="$(grep --invert-match '^#' "${version_file}")" \
+    version_requested="$(tfenv-parse-version-file "${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="$(grep --invert-match '^#' "${version_file}")" \
+    version_requested="$(tfenv-parse-version-file "${version_file}")" \
       || log 'error' "Failed to open ${version_file}";
   else
     log 'debug' "Version File is the default \${TFENV_CONFIG_DIR}/version (${TFENV_CONFIG_DIR}/version) but it doesn't exist";

libexec/tfenv-use

@@ -76,7 +76,7 @@ if [ -z "${requested_arg}" -a -z "${TFENV_TERRAFORM_VERSION:-""}" ]; then
   version_source_suffix=" (set by ${loaded_version_file})";
 
   if [ -f "${loaded_version_file}" ]; then
-    requested="$(grep --invert-match '^#' "${loaded_version_file}" || true)";
+    requested="$(tfenv-parse-version-file "${loaded_version_file}")";
   else
     # No-one asked for anything, no default version is set either
     requested='latest';