Merge branch 'master' into remove-versions-dir

e-nomem · May 27, 2020 · 16e2a56 · 16e2a56
2 parents 2f97567 + 2e0961d
commit 16e2a56
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/libexec/tfenv-install b/libexec/tfenv-install
@@ -137,7 +137,7 @@ case "${TFENV_CURL_OUTPUT:-2}" in
     curl_progress="-s";
     ;;
   *)
-    log 'error' 'TFENV_CURL_OUTPUT specified, but not with a support value ([0,1,2])';
+    log 'error' 'TFENV_CURL_OUTPUT specified, but not with a supported value ([0,1,2])';
     ;;
 esac;
 
@@ -233,7 +233,8 @@ fi;
 
 mkdir -p "${dst_path}" || log 'error' "Failed to make directory ${dst_path}";
 
-declare unzip_output="$(unzip "${download_tmp}/${tarball_name}" -d "${dst_path}" || log 'error' 'Tarball unzip failed')";
+declare unzip_output;
+unzip_output="$(unzip "${download_tmp}/${tarball_name}" -d "${dst_path}")" || log 'error' 'Tarball unzip failed';
 while IFS= read -r unzip_line; do
  log 'info' "${unzip_line}";
 done < <(printf '%s\n' "${unzip_output}");