Skip to content

Commit

Permalink
Don't let tfenv-version-name fail tfenv-list
Browse files Browse the repository at this point in the history
tfenv-list:Helpfully note when no default is set
  • Loading branch information
schlueter authored and Zordrak committed Feb 6, 2021
1 parent 6d16fa5 commit dcc5080
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions libexec/tfenv-list
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@ done;
[[ -x "${TFENV_ROOT}/versions" && -r "${TFENV_ROOT}/versions" ]] \
|| log 'error' "tfenv versions directory is inaccessible: ${TFENV_ROOT}/versions";

version_name="$(tfenv-version-name)" \
&& log 'debug' "tfenv-version-name reported: ${version_name}" \
|| log 'error' "tfenv-version-name failed";
version_name="$(tfenv-version-name 2>/dev/null || true)" \
&& log 'debug' "tfenv-version-name reported: ${version_name}";
export version_name;

if [ -z "${TFENV_TERRAFORM_VERSION:-""}" ]; then
Expand All @@ -82,9 +81,21 @@ else
fi
export version_source;

# Register for whether a default terraform version has yet been set
declare -i default_set=0;

print_version () {
if [ "${1}" == "${version_name}" ]; then
<<<<<<< HEAD
echo "* ${1} (set by ${version_source})";
=======
echo "* ${1} (set by ${version_file})";
<<<<<<< HEAD
export default_set=1
>>>>>>> c13cacc... tfenv-list:Helpfully note when no default is set
=======
default_set=1
>>>>>>> 15e68d0... Syntax
else
echo " ${1}";
fi;
Expand All @@ -101,3 +112,5 @@ log 'debug' 'Printing versions...';
for local_version in ${local_versions[@]}; do
print_version "${local_version}";
done;

! ((default_set)) && log 'info' "No default set. Set with 'tfenv use <version>'";

0 comments on commit dcc5080

Please sign in to comment.