Skip to content

Commit 4dd303a

Browse files
committed
Fix #315
1 parent bdce331 commit 4dd303a

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

libexec/tfenv-use

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,18 @@ done;
6666
declare requested_arg="${1:-""}";
6767
declare version_source_suffix="";
6868
declare requested="${requested_arg}";
69+
declare loaded_version_file="$(tfenv-version-file)";
6970

7071
if [ -z "${requested_arg}" -a -z "${TFENV_TERRAFORM_VERSION:-""}" ]; then
71-
version_source_suffix=" (set by $(tfenv-version-file))";
72-
requested="$(cat "$(tfenv-version-file)" || true)";
72+
version_source_suffix=" (set by ${loaded_version_file})";
73+
74+
if [ -f "${loaded_version_file}" ]; then
75+
requested="$(cat "${loaded_version_file}" || true)";
76+
else
77+
# No-one asked for anything, no default version is set either
78+
requested='latest';
79+
fi;
80+
7381
elif [ -z "${requested_arg}" ]; then
7482
version_source_suffix=' (set by TFENV_TERRAFORM_VERSION)';
7583
requested="${TFENV_TERRAFORM_VERSION}";
@@ -106,8 +114,8 @@ log 'debug' "Writing \"${version}\" to \"${version_file}\"";
106114
echo "${version}" > "${version_file}" \
107115
|| log 'error' "Switch to v${version} failed";
108116

109-
if [ "${version_file}" != "$(tfenv-version-file)" ]; then
110-
log 'warn' "Default version file overridden by $(tfenv-version-file), changing the default version has no effect";
117+
if [ "${version_file}" != "${loaded_version_file}" ]; then
118+
log 'warn' "Default version file overridden by ${loaded_version_file}, changing the default version has no effect";
111119
fi;
112120

113121
terraform version 1>/dev/null \

0 commit comments

Comments
 (0)