Refactor readlink_f to common helpers

tfutils · Nov 5, 2022 · 23aea38 · 23aea38
1 parent 9cb216c
commit 23aea38
Show file tree

Hide file tree

Showing 23 changed files with 15 additions and 320 deletions.
diff --git a/bin/terraform b/bin/terraform
@@ -11,19 +11,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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 "${target_file%/*}" || early_death "Failed to 'cd \$(${target_file%/*})' while trying to determine TFENV_ROOT";
-      file_name="${target_file##*/}" || early_death "Failed to '\"${target_file##*/}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
   TFENV_SHIM=$(readlink_f "${0}")
   TFENV_ROOT="${TFENV_SHIM%/*/*}";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT";

diff --git a/bin/tfenv b/bin/tfenv
@@ -11,19 +11,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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 "${target_file%/*}" || early_death "Failed to 'cd \$(${target_file%/*})' while trying to determine TFENV_ROOT";
-      file_name="${target_file##*/}" || early_death "Failed to '\"${target_file##*/}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
   TFENV_SHIM=$(readlink_f "${0}")
   TFENV_ROOT="${TFENV_SHIM%/*/*}";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT";

diff --git a/lib/helpers.sh b/lib/helpers.sh
@@ -2,20 +2,22 @@
 
 set -uo pipefail;
 
+# 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 "${target_file%/*}" || early_death "Failed to 'cd \$(${target_file%/*})'";
+    file_name="${target_file##*/}" || early_death "Failed to '\"${target_file##*/}\"'";
+    target_file="$(readlink "${file_name}")";
+  done;
+
+  echo "$(pwd -P)/${file_name}";
+};
+export -f readlink_f;
+
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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 "${target_file%/*}" || early_death "Failed to 'cd \$(${target_file%/*})' while trying to determine TFENV_ROOT";
-      file_name="${target_file##*/}" || early_death "Failed to '\"${target_file##*/}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
   TFENV_SHIM=$(readlink_f "${0}")
   TFENV_ROOT="${TFENV_SHIM%/*/*}";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT";

diff --git a/lib/tfenv-exec.sh b/lib/tfenv-exec.sh
@@ -5,21 +5,6 @@ set -uo pipefail;
 function realpath-relative-to() {
   # A basic implementation of GNU `realpath --relative-to=$1 $2`
   # that can also be used on macOS.
-
-  # 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")" || early_death "Failed to 'cd \$(${target_file%/*})'";
-      file_name="${target_file##*/}" || early_death "Failed to '\"${target_file##*/}\"'";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   local relative_to="$(readlink_f "${1}")";
   local path="$(readlink_f "${2}")";
 

diff --git a/libexec/tfenv---version b/libexec/tfenv---version
@@ -21,20 +21,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/libexec/tfenv-exec b/libexec/tfenv-exec
@@ -25,20 +25,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/libexec/tfenv-install b/libexec/tfenv-install
@@ -11,20 +11,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/libexec/tfenv-list b/libexec/tfenv-list
@@ -12,20 +12,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/libexec/tfenv-list-remote b/libexec/tfenv-list-remote
@@ -12,20 +12,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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}")" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/libexec/tfenv-min-required b/libexec/tfenv-min-required
@@ -14,20 +14,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/libexec/tfenv-pin b/libexec/tfenv-pin
@@ -12,20 +12,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/libexec/tfenv-resolve-version b/libexec/tfenv-resolve-version
@@ -14,20 +14,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/libexec/tfenv-uninstall b/libexec/tfenv-uninstall
@@ -12,20 +12,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/libexec/tfenv-use b/libexec/tfenv-use
@@ -11,20 +11,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/libexec/tfenv-version-file b/libexec/tfenv-version-file
@@ -14,20 +14,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/libexec/tfenv-version-name b/libexec/tfenv-version-name
@@ -13,20 +13,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/test/run.sh b/test/run.sh
@@ -11,20 +11,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n ${TFENV_ROOT} ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else

diff --git a/test/test_install_and_use.sh b/test/test_install_and_use.sh
@@ -11,20 +11,6 @@ function early_death() {
 };
 
 if [ -z "${TFENV_ROOT:-""}" ]; then
-  # 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})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
-      file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
-      target_file="$(readlink "${file_name}")";
-    done;
-
-    echo "$(pwd -P)/${file_name}";
-  };
-
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
   [ -n ${TFENV_ROOT} ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else