A little militant cleanup

Zordrak · Zordrak · commit e3462b59b18c · 2022-07-07T13:34:52.000+01:00
diff --git a/bin/terraform b/bin/terraform
@@ -26,7 +26,7 @@ if [ -z "${TFENV_ROOT:-""}" ]; then
   };
   TFENV_SHIM=$(readlink_f "${0}")
   TFENV_ROOT="${TFENV_SHIM%/*/*}";
-  [ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT"
+  [ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT";
 else
   TFENV_ROOT="${TFENV_ROOT%/}";
 fi;
@@ -47,7 +47,7 @@ fi;
 for dir in libexec bin; do
   case ":${PATH}:" in
     *:${TFENV_ROOT}/${dir}:*) log 'debug' "\$PATH already contains '${TFENV_ROOT}/${dir}', not adding it again";;
-    *) 
+    *)
       log 'debug' "\$PATH does not contain '${TFENV_ROOT}/${dir}', prepending and exporting it now";
       export PATH="${TFENV_ROOT}/${dir}:${PATH}";
       ;;
@@ -62,4 +62,4 @@ log 'debug' "program=\"${0##*/}\"";
 
 declare tfenv_path="${TFENV_ROOT}/bin/tfenv";
 
-tfenv-exec "$@"
+tfenv-exec "$@";
diff --git a/bin/tfenv b/bin/tfenv
@@ -26,7 +26,7 @@ if [ -z "${TFENV_ROOT:-""}" ]; then
   };
   TFENV_SHIM=$(readlink_f "${0}")
   TFENV_ROOT="${TFENV_SHIM%/*/*}";
-  [ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT"
+  [ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT";
 
 else
   TFENV_ROOT="${TFENV_ROOT%/}";
@@ -48,7 +48,7 @@ fi;
 for dir in libexec bin; do
   case ":${PATH}:" in
     *:${TFENV_ROOT}/${dir}:*) log 'debug' "\$PATH already contains '${TFENV_ROOT}/${dir}', not adding it again";;
-    *) 
+    *)
       log 'debug' "\$PATH does not contain '${TFENV_ROOT}/${dir}', prepending and exporting it now";
       export PATH="${TFENV_ROOT}/${dir}:${PATH}";
       ;;
@@ -62,7 +62,7 @@ done;
 declare arg="${1:-""}";
 
 log 'debug' "Setting TFENV_DIR to ${PWD}";
-export TFENV_DIR="${PWD}"
+export TFENV_DIR="${PWD}";
 
 abort() {
   log 'debug' 'Aborting...';
diff --git a/lib/bashlog.sh b/lib/bashlog.sh
@@ -65,8 +65,8 @@ function log() {
   local severities_ALERT=1;  # Unused
   local severities_EMERG=0;  # Unused
 
-  local severity_var="severities_${upper}"
-  local severity="${!severity_var:-3}"
+  local severity_var="severities_${upper}";
+  local severity="${!severity_var:-3}";
 
   if [ "${debug_level}" -gt 0 ] || [ "${severity}" -lt 7 ]; then
 
@@ -111,7 +111,7 @@ function log() {
   local colours_DEFAULT='\033[0m' # Default
 
   local norm="${colours_DEFAULT}";
-  local colour_var="colours_${upper}"
+  local colour_var="colours_${upper}";
   local colour="${!colour_var:-\033[31m}";
 
   local std_line;
diff --git a/lib/helpers.sh b/lib/helpers.sh
@@ -18,7 +18,7 @@ if [ -z "${TFENV_ROOT:-""}" ]; then
   };
   TFENV_SHIM=$(readlink_f "${0}")
   TFENV_ROOT="${TFENV_SHIM%/*/*}";
-  [ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT"
+  [ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT";
 else
   TFENV_ROOT="${TFENV_ROOT%/}";
 fi;
@@ -44,23 +44,24 @@ fi;
 
 function load_bashlog () {
   source "${TFENV_ROOT}/lib/bashlog.sh";
-}
+};
 export -f load_bashlog;
+
 if [ "${TFENV_DEBUG:-0}" -gt 0 ] ; then
   # our shim below cannot be used when debugging is enabled
-  load_bashlog
+  load_bashlog;
 else
   # Shim that understands to no-op for debug messages, and defers to
   # full bashlog for everything else.
   function log () {
     if [ "$1" != 'debug' ] ; then
       # Loading full bashlog will overwrite the `log` function
-      load_bashlog
-      log "$@"
-    fi
-  }
+      load_bashlog;
+      log "$@";
+    fi;
+  };
   export -f log;
-fi
+fi;
 
 resolve_version () {
   declare version_requested version regex min_required version_file;
@@ -78,10 +79,10 @@ resolve_version () {
     fi
 
     if [ -z "${version_requested:-""}" ]; then
-      log 'debug' 'Tryng to set version from "required_version" under "terraform" section'
+      log 'debug' 'Trying to set version from "required_version" under "terraform" section';
       versions="$( echo $(cat {*.tf,*.tf.json} 2>/dev/null | grep -h required_version) | 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]}"
+        found_min_required="${BASH_REMATCH[1]}${BASH_REMATCH[2]}";
         if [[ "${found_min_required}" =~ ^!=.+ ]]; then
           log 'debug' "required_version is a negation - we cannot guess the desired one, skipping.";
         else
@@ -145,7 +146,7 @@ resolve_version () {
     regex="^${version_requested}$";
     log 'debug' "Version is explicit: ${version}. Regex enforces the version: ${regex}";
   fi;
-}
+};
 
 # Curl wrapper to switch TLS option for each OS
 function curlw () {
@@ -163,13 +164,13 @@ function curlw () {
   fi;
 
   curl ${TLS_OPT} ${NETRC_OPT} "$@";
-}
+};
 export -f curlw;
 
 check_active_version() {
   local v="${1}";
   [ -n "$(${TFENV_ROOT}/bin/terraform version | grep -E "^Terraform v${v}((-dev)|( \([a-f0-9]+\)))?$")" ];
-}
+};
 export -f check_active_version;
 
 check_installed_version() {
diff --git a/lib/tfenv-exec.sh b/lib/tfenv-exec.sh
@@ -33,5 +33,5 @@ function tfenv-exec() {
   || log 'error' "Failed to execute: ${TF_BIN_PATH} $*";
 
   return 0;
-}
+};
 export -f tfenv-exec;
diff --git a/lib/tfenv-version-file.sh b/lib/tfenv-version-file.sh
@@ -14,7 +14,7 @@ find_local_version_file() {
   done;
   log 'debug' "No version file found in ${1}";
   return 1;
-}
+};
 export -f find_local_version_file;
 
 function tfenv-version-file() {
@@ -24,5 +24,5 @@ function tfenv-version-file() {
       echo "${TFENV_CONFIG_DIR}/version";
     fi;
   fi;
-}
+};
 export -f tfenv-version-file;
diff --git a/lib/tfenv-version-name.sh b/lib/tfenv-version-name.sh
@@ -5,11 +5,11 @@ function tfenv-version-name() {
       || log 'error' 'Failed to retrieve TFENV_VERSION_FILE from tfenv-version-file';
 
     if [ "${TFENV_VERSION_FILE}" = "${TFENV_CONFIG_DIR}/version" ]; then
-      log 'debug' 'Tryng to set version from "required_version" under "terraform" section'
+      log 'debug' 'Tryng to set version from "required_version" under "terraform" section';
 
       versions="$( echo $(cat {*.tf,*.tf.json} 2>/dev/null | grep -h required_version) | 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]}"
+        found_min_required="${BASH_REMATCH[1]}${BASH_REMATCH[2]}";
         if [[ "${found_min_required}" =~ ^!=.+ ]]; then
           log 'debug' "required_version is a negation - we cannot guess the desired one, skipping.";
         else
@@ -25,7 +25,7 @@ function tfenv-version-name() {
         fi;
       fi;
 
-      TFENV_VERSION_SOURCE='terraform{required_version}'
+      TFENV_VERSION_SOURCE='terraform{required_version}';
     fi;
 
     if [[ -z "${TFENV_VERSION:-""}" ]]; then
@@ -89,7 +89,7 @@ function tfenv-version-name() {
 
     # Accept a v-prefixed version, but strip the v.
     if [[ "${TFENV_VERSION}" =~ ^v.*$ ]]; then
-      log 'debug' "Version Requested is prefixed with a v. Stripping the v."
+      log 'debug' "Version Requested is prefixed with a v. Stripping the v.";
       TFENV_VERSION="${TFENV_VERSION#v*}";
     fi;
   fi;
@@ -103,6 +103,6 @@ function tfenv-version-name() {
   fi;
 
   echo "${TFENV_VERSION}";
-}
+};
 export -f tfenv-version-name;
 
diff --git a/libexec/tfenv---version b/libexec/tfenv---version
@@ -57,7 +57,7 @@ fi;
 for dir in libexec bin; do
   case ":${PATH}:" in
     *:${TFENV_ROOT}/${dir}:*) log 'debug' "\$PATH already contains '${TFENV_ROOT}/${dir}', not adding it again";;
-    *) 
+    *)
       log 'debug' "\$PATH does not contain '${TFENV_ROOT}/${dir}', prepending and exporting it now";
       export PATH="${TFENV_ROOT}/${dir}:${PATH}";
       ;;
diff --git a/libexec/tfenv-exec b/libexec/tfenv-exec
@@ -61,7 +61,7 @@ fi;
 for dir in libexec bin; do
   case ":${PATH}:" in
     *:${TFENV_ROOT}/${dir}:*) log 'debug' "\$PATH already contains '${TFENV_ROOT}/${dir}', not adding it again";;
-    *) 
+    *)
       log 'debug' "\$PATH does not contain '${TFENV_ROOT}/${dir}', prepending and exporting it now";
       export PATH="${TFENV_ROOT}/${dir}:${PATH}";
       ;;
@@ -72,4 +72,4 @@ done;
 # Begin Script Body #
 #####################
 
-tfenv-exec "$@"
+tfenv-exec "$@";
diff --git a/libexec/tfenv-init b/libexec/tfenv-init
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-[ -n "${TFENV_DEBUG}" ] && set -x
+[ -n "${TFENV_DEBUG}" ] && set -x:
 
-export PATH="${TFENV_ROOT}/bin:${PATH}"
+export PATH="${TFENV_ROOT}/bin:${PATH}";
diff --git a/libexec/tfenv-install b/libexec/tfenv-install
@@ -118,7 +118,7 @@ case "$(uname -s)" in
     os="windows_${TFENV_ARCH}";
     ;;
   FreeBSD*)
-    os="freebsd_${TFENV_ARCH}"
+    os="freebsd_${TFENV_ARCH}";
     ;;
   *)
     os="linux_${TFENV_ARCH}";
@@ -140,17 +140,20 @@ else
 fi;
 
 shasums_name="terraform_${version}_SHA256SUMS";
-shasums_signing_key_postfix=".72D7468F"
+shasums_signing_key_postfix=".72D7468F";
 shasums_sig="${shasums_name}${shasums_signing_key_postfix}.sig";
 
 log 'info' "Installing Terraform v${version}";
 
 # Create a local temporary directory for downloads
-tmpdir_arg="-t"
+tmpdir_arg="-t";
+
 if mktemp --help 2>&1 | grep -- '--tmpdir' >/dev/null; then
-  tmpdir_arg="--tmpdir"
-fi
+  tmpdir_arg="--tmpdir";
+fi;
+
 download_tmp="$(mktemp -d ${tmpdir_arg} tfenv_download.XXXXXX)" || log 'error' "Unable to create temporary download directory in $(pwd)";
+
 # Clean it up in case of error
 trap "rm -rf ${download_tmp}" EXIT;
 
@@ -194,10 +197,11 @@ download_signature() {
 if [[ $(uname) == 'Darwin' ]] && [ $(which brew) ]; then
   if ! [ $(which ggrep) ]; then
     brew install grep;
-  fi
-  shopt -s expand_aliases
+  fi;
+
+  shopt -s expand_aliases;
   alias grep=ggrep;
-fi
+fi;
 
 # Verify signature if verification mechanism (keybase, gpg, etc) is present
 if [[ -f "${TFENV_CONFIG_DIR}/use-gnupg" ]]; then
diff --git a/libexec/tfenv-list b/libexec/tfenv-list
@@ -48,7 +48,7 @@ fi;
 for dir in libexec bin; do
   case ":${PATH}:" in
     *:${TFENV_ROOT}/${dir}:*) log 'debug' "\$PATH already contains '${TFENV_ROOT}/${dir}', not adding it again";;
-    *) 
+    *)
       log 'debug' "\$PATH does not contain '${TFENV_ROOT}/${dir}', prepending and exporting it now";
       export PATH="${TFENV_ROOT}/${dir}:${PATH}";
       ;;
@@ -60,10 +60,10 @@ done;
 #####################
 
 [ "${#}" -ne 0 ] \
-  && log 'error' "usage: tfenv list"
+  && log 'error' "usage: tfenv list";
 
 [ -d "${TFENV_CONFIG_DIR}/versions" ] \
-  || log 'error' 'No versions available. Please install one with: tfenv install'
+  || log 'error' 'No versions available. Please install one with: tfenv install';
 
 [[ -x "${TFENV_CONFIG_DIR}/versions" && -r "${TFENV_CONFIG_DIR}/versions" ]] \
   || log 'error' "tfenv versions directory is inaccessible: ${TFENV_CONFIG_DIR}/versions";
@@ -78,7 +78,7 @@ if [ -z "${TFENV_TERRAFORM_VERSION:-""}" ]; then
     || log 'error' "tfenv-version-file failed";
 else
   version_source='TFENV_TERRAFORM_VERSION';
-fi
+fi;
 export version_source;
 
 # Register for whether a default terraform version has yet been set
@@ -87,7 +87,7 @@ declare -i default_set=0;
 print_version () {
   if [ "${1}" == "${version_name}" ]; then
     echo "* ${1} (set by ${version_source})";
-    default_set=1
+    default_set=1;
   else
     echo "  ${1}";
   fi;
diff --git a/libexec/tfenv-list-remote b/libexec/tfenv-list-remote
@@ -48,7 +48,7 @@ fi;
 for dir in libexec bin; do
   case ":${PATH}:" in
     *:${TFENV_ROOT}/${dir}:*) log 'debug' "\$PATH already contains '${TFENV_ROOT}/${dir}', not adding it again";;
-    *) 
+    *)
       log 'debug' "\$PATH does not contain '${TFENV_ROOT}/${dir}', prepending and exporting it now";
       export PATH="${TFENV_ROOT}/${dir}:${PATH}";
       ;;
@@ -60,11 +60,11 @@ done;
 #####################
 
 if [ "${#}" -ne 0 ];then
-  echo "usage: tfenv list-remote" 1>&2
+  echo "usage: tfenv list-remote" 1>&2;
   exit 1;
-fi
+fi;
 
-TFENV_REMOTE="${TFENV_REMOTE:-https://releases.hashicorp.com}"
+TFENV_REMOTE="${TFENV_REMOTE:-https://releases.hashicorp.com}";
 log 'debug' "TFENV_REMOTE: ${TFENV_REMOTE}";
 
 declare remote_versions;
diff --git a/libexec/tfenv-min-required b/libexec/tfenv-min-required
@@ -77,7 +77,7 @@ find_min_required() {
   versions="$( echo $(grep -h required_version "${root}"/{*.tf,*.tf.json} 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]}"
+    found_min_required="${BASH_REMATCH[1]}${BASH_REMATCH[2]}";
 
     if [[ "${found_min_required}" =~ ^!=.+ ]]; then
       log 'debug' "Error: Min required version is a negation ($found_min_required) - we cannot guess the desired one.";
diff --git a/libexec/tfenv-pin b/libexec/tfenv-pin
@@ -48,7 +48,7 @@ fi;
 for dir in libexec bin; do
   case ":${PATH}:" in
     *:${TFENV_ROOT}/${dir}:*) log 'debug' "\$PATH already contains '${TFENV_ROOT}/${dir}', not adding it again";;
-    *) 
+    *)
       log 'debug' "\$PATH does not contain '${TFENV_ROOT}/${dir}', prepending and exporting it now";
       export PATH="${TFENV_ROOT}/${dir}:${PATH}";
       ;;
@@ -60,10 +60,10 @@ done;
 #####################
 
 [ "${#}" -ne 0 ] \
-  && log 'error' "usage: tfenv pin"
+  && log 'error' "usage: tfenv pin";
 
 [ -d "${TFENV_CONFIG_DIR}/versions/" ] \
-  || log 'error' 'No versions available. Please install one with: tfenv install'
+  || log 'error' 'No versions available. Please install one with: tfenv install';
 
 [[ -x "${TFENV_CONFIG_DIR}/versions" && -r "${TFENV_CONFIG_DIR}/versions" ]] \
   || log 'error' "tfenv versions directory is inaccessible: ${TFENV_CONFIG_DIR}/versions";
diff --git a/libexec/tfenv-resolve-version b/libexec/tfenv-resolve-version
diff --git a/libexec/tfenv-uninstall b/libexec/tfenv-uninstall
diff --git a/libexec/tfenv-use b/libexec/tfenv-use
diff --git a/libexec/tfenv-version-file b/libexec/tfenv-version-file
diff --git a/libexec/tfenv-version-name b/libexec/tfenv-version-name
diff --git a/test/test_install_and_use_required_version.sh b/test/test_install_and_use_required_version.sh
