diff --git a/.travis.yml b/.travis.yml index 9c961b3..54b924d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,18 @@ language: generic +env: + - CLICOLOR=1 matrix: include: - os: linux dist: trusty + - os: linux + dist: xenial + - os: linux + dist: bionic + - os: osx + osx_image: xcode11.2 # OS X 10.14 + - os: osx + osx_image: xcode10.1 # OS X 10.13 - os: osx osx_image: xcode8.2 # OS X 10.12 - os: osx diff --git a/libexec/tfenv-list b/libexec/tfenv-list index 5d0de94..5aea0a3 100755 --- a/libexec/tfenv-list +++ b/libexec/tfenv-list @@ -20,6 +20,10 @@ print_version () { fi } -for local_version in $(ls -1 "${TFENV_ROOT}/versions" | sort -t'.' -k 1nr,1 -k 2nr,2 -k 3nr,3); do +versions="$(find "${TFENV_ROOT}/versions" -type d -exec basename {} \; \ + | tail -n +2 \ + | sort -t'.' -k 1nr,1 -k 2nr,2 -k 3nr,3)" + +for local_version in ${versions}; do print_version "${local_version}" done diff --git a/libexec/tfenv-use b/libexec/tfenv-use index 53296f1..2565fc0 100755 --- a/libexec/tfenv-use +++ b/libexec/tfenv-use @@ -35,7 +35,8 @@ fi [ -d "${TFENV_ROOT}/versions" ] \ || error_and_die "No versions of terraform installed. Please install one with: tfenv install" -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 diff --git a/libexec/tfenv-version-name b/libexec/tfenv-version-name index 25a122a..e36deec 100755 --- a/libexec/tfenv-version-name +++ b/libexec/tfenv-version-name @@ -13,7 +13,8 @@ TFENV_VERSION="$(cat "${TFENV_VERSION_FILE}" || true)" if [[ "${TFENV_VERSION}" =~ ^latest.*$ ]]; then [[ "${TFENV_VERSION}" =~ ^latest\:.*$ ]] && regex="${TFENV_VERSION##*\:}" - 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