Skip to content

Commit 256bb81

Browse files
authored
Merge branch 'master' into fix-301
2 parents c0c9611 + e289caf commit 256bb81

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

libexec/tfenv-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ if mktemp --help 2>&1 | grep -- '--tmpdir' >/dev/null; then
152152
tmpdir_arg="--tmpdir";
153153
fi;
154154

155-
download_tmp="$(mktemp -d ${tmpdir_arg} tfenv_download.XXXXXX)" || log 'error' "Unable to create temporary download directory in $(pwd)";
155+
download_tmp="$(mktemp -d ${tmpdir_arg} tfenv_download.XXXXXX)" || log 'error' "Unable to create temporary download directory (mktemp -d ${tmpdir_arg} tfenv_download.XXXXXX). Working Directory is: $(pwd)";
156156

157157
# Clean it up in case of error
158158
trap "rm -rf ${download_tmp}" EXIT;

libexec/tfenv-use

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ log 'debug' "Searching ${TFENV_CONFIG_DIR}/versions/ for latest version matching
100100
if [ -d "${TFENV_CONFIG_DIR}/versions" ]; then
101101
installed_version="$(\find "${TFENV_CONFIG_DIR}/versions/" -type d -exec basename {} \; \
102102
| tail -n +2 \
103-
| sort -t'.' -k 1nr,1 -k 2nr,2 -k 3nr,3 \
104103
| grep -e "${regex}" \
104+
| sort -t'.' -k 1nr,1 -k 2nr,2 -k 3r,3 \
105105
| head -n 1
106106
)";
107107
fi;
@@ -145,6 +145,4 @@ if [ "${version_file}" != "${loaded_version_file}" ]; then
145145
log 'warn' "Default version file overridden by ${loaded_version_file}, changing the default version has no effect";
146146
fi;
147147

148-
terraform version 1>/dev/null \
149-
|| log 'error' "'terraform version' failed. Something is seriously wrong";
150-
log 'info' "Switching completed";
148+
log 'info' "Default version (when not overridden by .terraform-version or TFENV_TERRAFORM_VERSION) is now: ${installed_version}";

0 commit comments

Comments
 (0)