Merge pull request tfutils#264 from hargut/master

add trailing slash for find command on list & use; allows versions di…
cjsilvadf · Aug 14, 2021 · 4e75af3 · 4e75af3
2 parents a3d5f46 + 4a84d2f
commit 4e75af3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/libexec/tfenv-list b/libexec/tfenv-list
@@ -94,7 +94,7 @@ print_version () {
 };
 
 log 'debug' 'Listing versions...';
-local_versions=($(\find "${TFENV_CONFIG_DIR}/versions" -type d -exec basename {} \; \
+local_versions=($(\find "${TFENV_CONFIG_DIR}/versions/" -type d -exec basename {} \; \
   | tail -n +2 \
   | sort -t'.' -k 1nr,1 -k 2nr,2 -k 3nr,3));
 

diff --git a/libexec/tfenv-use b/libexec/tfenv-use
@@ -81,8 +81,8 @@ declare resolved="$(tfenv-resolve-version ${requested_arg})";
 declare version="${resolved%%\:*}";
 declare regex="${resolved##*\:}";
 
-log 'debug' "Searching ${TFENV_CONFIG_DIR}/versions for latest version matching ${regex}";
-declare version="$(\find "${TFENV_CONFIG_DIR}/versions" -type d -exec basename {} \; \
+log 'debug' "Searching ${TFENV_CONFIG_DIR}/versions/ for latest version matching ${regex}";
+declare version="$(\find "${TFENV_CONFIG_DIR}/versions/" -type d -exec basename {} \; \
   | tail -n +2 \
   | sort -t'.' -k 1nr,1 -k 2nr,2 -k 3nr,3 \
   | grep -e "${regex}" \

diff --git a/libexec/tfenv-version-name b/libexec/tfenv-version-name
@@ -90,7 +90,7 @@ if [[ "${TFENV_VERSION}" =~ ^latest.*$ ]]; then
     log 'debug' "'latest' keyword does not use regex";
   fi;
 
-  version="$(\find "${TFENV_CONFIG_DIR}/versions" -type d -exec basename {} \; \
+  version="$(\find "${TFENV_CONFIG_DIR}/versions/" -type d -exec basename {} \; \
     | tail -n +2 \
     | sort -t'.' -k 1nr,1 -k 2nr,2 -k 3nr,3 \
     | grep -e "${regex}" \