Merge pull request #461 from tfutils/fix/406-431-version-name-bugs

Fix #406, Fix #431, Fix #447: Operator precedence bug and unbound variable in tfenv-version-name.sh

Author: Zordrak

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 | tr -d '\r')" \
+    TFENV_VERSION="$(cat "${TFENV_VERSION_FILE}" | tr -d '\r' || true)" \
       && log 'debug' "TFENV_VERSION specified in TFENV_VERSION_FILE: ${TFENV_VERSION}";
 
     TFENV_VERSION_SOURCE="${TFENV_VERSION_FILE}";
@@ -77,7 +77,7 @@ function tfenv-version-name() {
             TFENV_VERSION="${local_version}";
           fi;
       else
-        log 'error' "No versions matching '${requested}' found in remote";
+        log 'error' "No versions matching '${TFENV_VERSION}' found in remote";
       fi;
     else
       if [[ -n "${local_version}" ]]; then