From a869a93d5c6bb92cdcf289dbebad049d718de48e Mon Sep 17 00:00:00 2001
From: Alexander Sharov <kvendingoldo@yandex.ru>
Date: Wed, 3 Jan 2024 16:37:18 +0100
Subject: [PATCH] feat: rename library files to fix homebrew installation

---
 bin/tofu                               |   6 +++---
 bin/tofuenv                            |   6 +++---
 lib/{bashlog.sh => tofuenv-bashlog.sh} |   0
 lib/{helpers.sh => tofuenv-helpers.sh} |   2 +-
 libexec/tofuenv---version              |   6 +++---
 libexec/tofuenv-exec                   |   6 +++---
 libexec/tofuenv-install                |  13 +++++--------
 libexec/tofuenv-list                   |   6 +++---
 libexec/tofuenv-list-remote            |   6 +++---
 libexec/tofuenv-min-required           |   6 +++---
 libexec/tofuenv-pin                    |   6 +++---
 libexec/tofuenv-resolve-version        |   6 +++---
 libexec/tofuenv-uninstall              |   6 +++---
 libexec/tofuenv-use                    |   6 +++---
 libexec/tofuenv-version-file           |   6 +++---
 libexec/tofuenv-version-name           |   6 +++---
 share/hashicorp-keys.pgp               | Bin 5638 -> 0 bytes
 test/run.sh                            |   6 +++---
 test/test_install_and_use.sh           |   6 +++---
 test/test_list.sh                      |   6 +++---
 test/test_symlink.sh                   |   6 +++---
 test/test_uninstall.sh                 |   6 +++---
 test/test_use_latestallowed.sh         |   6 +++---
 test/test_use_minrequired.sh           |   6 +++---
 24 files changed, 66 insertions(+), 69 deletions(-)
 rename lib/{bashlog.sh => tofuenv-bashlog.sh} (100%)
 rename lib/{helpers.sh => tofuenv-helpers.sh} (98%)
 delete mode 100644 share/hashicorp-keys.pgp

diff --git a/bin/tofu b/bin/tofu
index 31b75e9..e2652f7 100755
--- a/bin/tofu
+++ b/bin/tofu
@@ -35,11 +35,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && >&2 echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && >&2 echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/bin/tofuenv b/bin/tofuenv
index bbdf7ea..a8784ad 100755
--- a/bin/tofuenv
+++ b/bin/tofuenv
@@ -36,11 +36,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && >&2 echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && >&2 echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/lib/bashlog.sh b/lib/tofuenv-bashlog.sh
similarity index 100%
rename from lib/bashlog.sh
rename to lib/tofuenv-bashlog.sh
diff --git a/lib/helpers.sh b/lib/tofuenv-helpers.sh
similarity index 98%
rename from lib/helpers.sh
rename to lib/tofuenv-helpers.sh
index 96f559e..1d215c2 100755
--- a/lib/helpers.sh
+++ b/lib/tofuenv-helpers.sh
@@ -43,7 +43,7 @@ if [ "${TOFUENV_DEBUG:-0}" -gt 0 ]; then
 fi;
 
 function load_bashlog () {
-  source "${TOFUENV_ROOT}/lib/bashlog.sh";
+  source "${TOFUENV_ROOT}/lib/tofuenv-bashlog.sh";
 };
 export -f load_bashlog;
 
diff --git a/libexec/tofuenv---version b/libexec/tofuenv---version
index cd6d3b3..71701a2 100755
--- a/libexec/tofuenv---version
+++ b/libexec/tofuenv---version
@@ -45,11 +45,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/libexec/tofuenv-exec b/libexec/tofuenv-exec
index fa4b867..0d055dc 100755
--- a/libexec/tofuenv-exec
+++ b/libexec/tofuenv-exec
@@ -49,11 +49,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/libexec/tofuenv-install b/libexec/tofuenv-install
index f93e696..3313294 100755
--- a/libexec/tofuenv-install
+++ b/libexec/tofuenv-install
@@ -35,11 +35,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
@@ -234,11 +234,8 @@ elif [[ -f "${TOFUENV_CONFIG_DIR}/use-gpgv" ]]; then
 
   download_signature;
   if [[ "${trust_tofuenv}" == 'yes' ]]; then
-    ${gpgv_command} \
-      --keyring "${TOFUENV_ROOT}/share/hashicorp-keys.pgp" \
-      "${download_tmp}/${shasums_sig}" \
-      "${download_tmp}/${shasums_name}" \
-      || log 'error' 'PGP signature rejected';
+    log 'error' 'Opentofu does not currently support PGP signatures.';
+
   else
     ${gpgv_command} \
       "${download_tmp}/${shasums_sig}" \
diff --git a/libexec/tofuenv-list b/libexec/tofuenv-list
index c62a970..9ae92d3 100755
--- a/libexec/tofuenv-list
+++ b/libexec/tofuenv-list
@@ -36,11 +36,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/libexec/tofuenv-list-remote b/libexec/tofuenv-list-remote
index 92082d8..d9e1e9f 100755
--- a/libexec/tofuenv-list-remote
+++ b/libexec/tofuenv-list-remote
@@ -36,11 +36,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/libexec/tofuenv-min-required b/libexec/tofuenv-min-required
index 27ff68b..5914c59 100755
--- a/libexec/tofuenv-min-required
+++ b/libexec/tofuenv-min-required
@@ -38,11 +38,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/libexec/tofuenv-pin b/libexec/tofuenv-pin
index 3d9a53c..49a5d01 100755
--- a/libexec/tofuenv-pin
+++ b/libexec/tofuenv-pin
@@ -36,11 +36,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/libexec/tofuenv-resolve-version b/libexec/tofuenv-resolve-version
index 60bcf1d..732cfcb 100755
--- a/libexec/tofuenv-resolve-version
+++ b/libexec/tofuenv-resolve-version
@@ -38,11 +38,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/libexec/tofuenv-uninstall b/libexec/tofuenv-uninstall
index 7c1334e..a9f12ef 100755
--- a/libexec/tofuenv-uninstall
+++ b/libexec/tofuenv-uninstall
@@ -36,11 +36,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/libexec/tofuenv-use b/libexec/tofuenv-use
index 44bbcb4..d3f616e 100755
--- a/libexec/tofuenv-use
+++ b/libexec/tofuenv-use
@@ -35,11 +35,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/libexec/tofuenv-version-file b/libexec/tofuenv-version-file
index cc6c550..01f43f7 100755
--- a/libexec/tofuenv-version-file
+++ b/libexec/tofuenv-version-file
@@ -38,11 +38,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/libexec/tofuenv-version-name b/libexec/tofuenv-version-name
index 87608de..65bc059 100755
--- a/libexec/tofuenv-version-name
+++ b/libexec/tofuenv-version-name
@@ -37,11 +37,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/share/hashicorp-keys.pgp b/share/hashicorp-keys.pgp
deleted file mode 100644
index d1421239742da717fb13e6605bb38ba9c6f5ca82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5638
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

diff --git a/test/run.sh b/test/run.sh
index ece6c16..7cdedfb 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -35,11 +35,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/test/test_install_and_use.sh b/test/test_install_and_use.sh
index cb2aeed..f8779d5 100755
--- a/test/test_install_and_use.sh
+++ b/test/test_install_and_use.sh
@@ -35,11 +35,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/test/test_list.sh b/test/test_list.sh
index 2ab25d1..2708eeb 100755
--- a/test/test_list.sh
+++ b/test/test_list.sh
@@ -36,11 +36,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/test/test_symlink.sh b/test/test_symlink.sh
index 9cb909b..28a7e5d 100755
--- a/test/test_symlink.sh
+++ b/test/test_symlink.sh
@@ -36,11 +36,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/test/test_uninstall.sh b/test/test_uninstall.sh
index b2857a6..0eb2b72 100755
--- a/test/test_uninstall.sh
+++ b/test/test_uninstall.sh
@@ -36,11 +36,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/test/test_use_latestallowed.sh b/test/test_use_latestallowed.sh
index 3341fb8..1180407 100755
--- a/test/test_use_latestallowed.sh
+++ b/test/test_use_latestallowed.sh
@@ -36,11 +36,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;
 
diff --git a/test/test_use_minrequired.sh b/test/test_use_minrequired.sh
index 86c3d57..aafe85e 100755
--- a/test/test_use_minrequired.sh
+++ b/test/test_use_minrequired.sh
@@ -36,11 +36,11 @@ export TOFUENV_ROOT;
 if [ -n "${TOFUENV_HELPERS:-""}" ]; then
   log 'debug' 'TOFUENV_HELPERS is set, not sourcing helpers again';
 else
-  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
-  if source "${TOFUENV_ROOT}/lib/helpers.sh"; then
+  [ "${TOFUENV_DEBUG:-0}" -gt 0 ] && echo "[DEBUG] Sourcing helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
+  if source "${TOFUENV_ROOT}/lib/tofuenv-helpers.sh"; then
     log 'debug' 'Helpers sourced successfully';
   else
-    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/helpers.sh";
+    early_death "Failed to source helpers from ${TOFUENV_ROOT}/lib/tofuenv-helpers.sh";
   fi;
 fi;