Skip to content

Commit 8742a28

Browse files
committed
Get rid of forking to basename and dirname on the hot path
1 parent baf79ce commit 8742a28

3 files changed

Lines changed: 15 additions & 14 deletions

File tree

bin/terraform

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ if [ -z "${TFENV_ROOT:-""}" ]; then
1717
local file_name;
1818

1919
while [ "${target_file}" != "" ]; do
20-
cd "$(dirname ${target_file})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
21-
file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
20+
cd "${target_file%/*}" || early_death "Failed to 'cd \$(${target_file%/*})' while trying to determine TFENV_ROOT";
21+
file_name="${target_file##*/}" || early_death "Failed to '\"${target_file##*/}\"' while trying to determine TFENV_ROOT";
2222
target_file="$(readlink "${file_name}")";
2323
done;
2424

2525
echo "$(pwd -P)/${file_name}";
2626
};
27-
28-
TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
29-
[ -n ${TFENV_ROOT} ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
27+
TFENV_SHIM=$(readlink_f "${0}")
28+
TFENV_ROOT="${TFENV_SHIM%/*/*}";
29+
[ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT"
3030
else
3131
TFENV_ROOT="${TFENV_ROOT%/}";
3232
fi;

bin/tfenv

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ if [ -z "${TFENV_ROOT:-""}" ]; then
1717
local file_name;
1818

1919
while [ "${target_file}" != "" ]; do
20-
cd "$(dirname ${target_file})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
21-
file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
20+
cd "${target_file%/*}" || early_death "Failed to 'cd \$(${target_file%/*})' while trying to determine TFENV_ROOT";
21+
file_name="${target_file##*/}" || early_death "Failed to '\"${target_file##*/}\"' while trying to determine TFENV_ROOT";
2222
target_file="$(readlink "${file_name}")";
2323
done;
2424

2525
echo "$(pwd -P)/${file_name}";
2626
};
27+
TFENV_SHIM=$(readlink_f "${0}")
28+
TFENV_ROOT="${TFENV_SHIM%/*/*}";
29+
[ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT"
2730

28-
TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
29-
[ -n ${TFENV_ROOT} ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
3031
else
3132
TFENV_ROOT="${TFENV_ROOT%/}";
3233
fi;

lib/helpers.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ if [ -z "${TFENV_ROOT:-""}" ]; then
99
local file_name;
1010

1111
while [ "${target_file}" != "" ]; do
12-
cd "$(dirname ${target_file})" || early_death "Failed to 'cd \$(dirname ${target_file})' while trying to determine TFENV_ROOT";
13-
file_name="$(basename "${target_file}")" || early_death "Failed to 'basename \"${target_file}\"' while trying to determine TFENV_ROOT";
12+
cd "${target_file%/*}" || early_death "Failed to 'cd \$(${target_file%/*})' while trying to determine TFENV_ROOT";
13+
file_name="${target_file##*/}" || early_death "Failed to '\"${target_file##*/}\"' while trying to determine TFENV_ROOT";
1414
target_file="$(readlink "${file_name}")";
1515
done;
1616

1717
echo "$(pwd -P)/${file_name}";
1818
};
19-
20-
TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
21-
[ -n ${TFENV_ROOT} ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
19+
TFENV_SHIM=$(readlink_f "${0}")
20+
TFENV_ROOT="${TFENV_SHIM%/*/*}";
21+
[ -n "${TFENV_ROOT}" ] || early_death "Failed to determine TFENV_ROOT"
2222
else
2323
TFENV_ROOT="${TFENV_ROOT%/}";
2424
fi;

0 commit comments

Comments
 (0)