Merge pull request tfutils#152 from amontalban/fix_ls_macos

Fix bug on MacOS when using CLICOLOR=1
omarny · May 27, 2020 · 4f1ef20 · 4f1ef20
2 parents 5d94b99 + 6a877b8
commit 4f1ef20
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,6 @@
 language: generic
+env:
+  - CLICOLOR=1
 matrix:
   include:
     - os: windows
@@ -10,9 +12,13 @@ matrix:
     - os: linux
       dist: trusty
     - os: osx
-      osx_image: xcode11.3
+      osx_image: xcode11.4
+    - os: osx
+      osx_image: xcode11.2 # OS X 10.14
     - os: osx
       osx_image: xcode10.3
+    - os: osx
+      osx_image: xcode10.1 # OS X 10.13
     - os: osx
       osx_image: xcode9.4
 script:

diff --git a/libexec/tfenv-list b/libexec/tfenv-list
@@ -87,12 +87,13 @@ print_version () {
 };
 
 log 'debug' 'Listing versions...';
-local_versions=($(ls -1 "${TFENV_ROOT}/versions" \
+local_versions=($(\find "${TFENV_ROOT}/versions" -type d -exec basename {} \; \
+  | tail -n +2 \
   | sort -t'.' -k 1nr,1 -k 2nr,2 -k 3nr,3));
 
 log 'debug' "Local versions: ${local_versions[@]}";
 
 log 'debug' 'Printing versions...';
 for local_version in ${local_versions[@]}; do
   print_version "${local_version}";
-done;
+done;
diff --git a/libexec/tfenv-use b/libexec/tfenv-use
@@ -72,7 +72,8 @@ declare version="${resolved%%\:*}";
 declare regex="${resolved##*\:}";
 
 log 'debug' "Searching ${TFENV_ROOT}/versions for latest version matching ${regex}";
-declare version="$(\ls "${TFENV_ROOT}/versions" \
+declare version="$(\find "${TFENV_ROOT}/versions" -type d -exec basename {} \; \
+  | tail -n +2 \
   | sort -t'.' -k 1nr,1 -k 2nr,2 -k 3nr,3 \
   | grep -e "${regex}" \
   | head -n 1

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