From 228b4ef1f145acaa7cdb268891091842a28e0277 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Fri, 12 Feb 2021 09:29:29 -0500
Subject: [PATCH] Fix mtbuild.rc detection.

---
 build-minetest-here.sh           | 14 ++++++++++----
 reset-minetest-install-source.sh | 14 +++++++++++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/build-minetest-here.sh b/build-minetest-here.sh
index 22832ca..72979e5 100755
--- a/build-minetest-here.sh
+++ b/build-minetest-here.sh
@@ -9,21 +9,27 @@ customExit(){
     # echo
 #fi
 # cd $mybuild || customExit "$0: cd build failed in '`pwd`'."
-
+printf "* detecting EnlivenMinetest..."
 if [ -z "$ENLIVEN_REPO" ]; then
     try_default_enliven_repo="$HOME/git/EnlivenMinetest"
     for try_enliven_repo in "$HOME/Downloads/poikilos/EnlivenMinetest" "$HOME/Downloads/EnlivenMinetest" "$try_default_enliven_repo"
     do
         if [ -d "$try_enliven_repo" ]; then
             ENLIVEN_REPO="$try_enliven_repo"
+            echo "Detected ENLIVEN_REPO=\"$try_enliven_repo\""
+        else
+            echo "Tried \"$try_enliven_repo\" (not found)"
         fi
     done
 fi
 source mtbuild.rc
 if [ $? -ne 0 ]; then
-    echo "Error:"
-    echo "source mtbuild.rc failed. Try adding it to the path or $try_default_enliven_repo (or set ENLIVEN_REPO)"
-    exit 1
+    source "$ENLIVEN_REPO/mtbuild.rc"
+    if [ $? -ne 0 ]; then
+        echo "Error:"
+        echo "source mtbuild.rc failed. Try adding it to the path or $try_default_enliven_repo (or set ENLIVEN_REPO)"
+        exit 1
+    fi
 fi
 
 
diff --git a/reset-minetest-install-source.sh b/reset-minetest-install-source.sh
index 3e22de3..52e6558 100755
--- a/reset-minetest-install-source.sh
+++ b/reset-minetest-install-source.sh
@@ -259,20 +259,28 @@ fi
 if [ -z "$DEPS_INSTALL" ]; then
     DEPS_INSTALL=
 fi
+
+printf "* detecting EnlivenMinetest..."
 if [ -z "$ENLIVEN_REPO" ]; then
     try_default_enliven_repo="$HOME/git/EnlivenMinetest"
     for try_enliven_repo in "$HOME/Downloads/poikilos/EnlivenMinetest" "$HOME/Downloads/EnlivenMinetest" "$try_default_enliven_repo"
     do
         if [ -d "$try_enliven_repo" ]; then
             ENLIVEN_REPO="$try_enliven_repo"
+            echo "Detected ENLIVEN_REPO=\"$try_enliven_repo\""
+        else
+            echo "Tried \"$try_enliven_repo\" (not found)"
         fi
     done
 fi
 source mtbuild.rc
 if [ $? -ne 0 ]; then
-    echo "Error:"
-    echo "source mtbuild.rc failed. Try adding it to the path or $try_default_enliven_repo (or set ENLIVEN_REPO)"
-    exit 1
+    source "$ENLIVEN_REPO/mtbuild.rc"
+    if [ $? -ne 0 ]; then
+        echo "Error:"
+        echo "source mtbuild.rc failed. Try adding it to the path or $try_default_enliven_repo (or set ENLIVEN_REPO)"
+        exit 1
+    fi
 fi
 if [ $mtLibrariesCompileResult -ne 0 ]; then
     cat "$extracted_path/libraries.log"