Merge pull request #21 from kamatama41/fix-patch-1

Fix symlinking support

Author: kamatama41

README.md

@@ -25,6 +25,12 @@ Currently tfenv supports the following OSes
   fi
   ```
 
+  OR you can make a symlink into a path that is already added to your `$PATH` 
+
+  ```
+  ln -s /some/path/to/tfenv/bin/tfenv /usr/local/bin/tfenv
+  ```
+
 ## Usage
 ### tfenv install
 Install a specific version of Terraform

bin/tfenv

@@ -5,8 +5,22 @@ if [ -n "$TFENV_DEBUG" ]; then
   set -x
 fi
 
+# http://stackoverflow.com/questions/1055671/how-can-i-get-the-behavior-of-gnus-readlink-f-on-a-mac
+readlink_f() {
+  local target_file=$1
+  local file_name
+
+  while [ "$target_file" != "" ]; do
+    cd $(dirname ${target_file})
+    file_name=$(basename ${target_file})
+    target_file=$(readlink ${file_name})
+  done
+
+  echo $(pwd -P)/${file_name}
+}
+
 if [ -z "${TFENV_ROOT}" ]; then
-  TFENV_ROOT=$(cd $(dirname $0)/.. && pwd)
+  TFENV_ROOT=$(cd $(dirname $(readlink_f $0))/.. && pwd)
 else
   TFENV_ROOT="${TFENV_ROOT%/}"
 fi

libexec/tfenv---version

@@ -12,7 +12,7 @@
 set -e
 [ -n "$TFENV_DEBUG" ] && set -x
 
-version="0.3.1"
+version="0.3.2"
 git_revision=""
 
 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q tfenv; then

test/run.sh

@@ -4,7 +4,7 @@ if [ -n "$TFENV_DEBUG" ]; then
   export PS4='+ [${BASH_SOURCE##*/}:${LINENO}] '
   set -x
 fi
-export TFENV_ROOT=$(cd $(dirname $0)/.. && pwd)
+TFENV_ROOT=$(cd $(dirname $0)/.. && pwd)
 export PATH="${TFENV_ROOT}/bin:${PATH}"
 
 errors=()

test/test_install_and_use.sh

@@ -8,8 +8,8 @@ check_version() {
 }
 
 echo "### Install latest version"
-rm -rf ${TFENV_ROOT}/versions
-rm -rf ${TFENV_ROOT}/.terraform-version
+rm -rf ./versions
+rm -rf ./.terraform-version
 
 v=$(tfenv list-remote | head -n 1)
 tfenv install latest
@@ -20,8 +20,8 @@ if ! check_version ${v}; then
 fi
 
 echo "### Install specific version"
-rm -rf ${TFENV_ROOT}/versions
-rm -rf ${TFENV_ROOT}/.terraform-version
+rm -rf ./versions
+rm -rf ./.terraform-version
 
 v=0.6.16
 tfenv install ${v}
@@ -32,11 +32,11 @@ if ! check_version ${v}; then
 fi
 
 echo "### Install .terraform-version"
-rm -rf ${TFENV_ROOT}/versions
-rm -rf ${TFENV_ROOT}/.terraform-version
+rm -rf ./versions
+rm -rf ./.terraform-version
 
 v=0.6.15
-touch ${TFENV_ROOT}/.terraform-version && echo ${v} > ${TFENV_ROOT}/.terraform-version
+echo ${v} > ./.terraform-version
 tfenv install
 if ! check_version ${v}; then
   echo "Installing .terraform-version ${v}" 1>&2

test/test_list.sh

@@ -2,7 +2,7 @@
 
 [ -n "$TFENV_DEBUG" ] && set -x
 
-rm -rf ${TFENV_ROOT}/versions
+rm -rf ./versions
 
 echo "### List local versions"
 for v in 0.6.2 0.6.16 0.7.0-rc4 0.7.0 0.8.0-beta2; do

test/test_symlink.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+[ -n "$TFENV_DEBUG" ] && set -x
+
+TFENV_BIN_SYM=/tmp/tfenv
+rm -rf ${TFENV_BIN_SYM}
+ln -s ${PWD}/bin/tfenv ${TFENV_BIN_SYM}
+
+echo "### Test supporting symlink"
+${TFENV_BIN_SYM} --help