Browse Source

Fix mtbuild.rc detection.

master
poikilos 4 years ago
parent
commit
228b4ef1f1
  1. 8
      build-minetest-here.sh
  2. 8
      reset-minetest-install-source.sh

8
build-minetest-here.sh

@ -9,22 +9,28 @@ customExit(){
# echo # echo
#fi #fi
# cd $mybuild || customExit "$0: cd build failed in '`pwd`'." # cd $mybuild || customExit "$0: cd build failed in '`pwd`'."
printf "* detecting EnlivenMinetest..."
if [ -z "$ENLIVEN_REPO" ]; then if [ -z "$ENLIVEN_REPO" ]; then
try_default_enliven_repo="$HOME/git/EnlivenMinetest" try_default_enliven_repo="$HOME/git/EnlivenMinetest"
for try_enliven_repo in "$HOME/Downloads/poikilos/EnlivenMinetest" "$HOME/Downloads/EnlivenMinetest" "$try_default_enliven_repo" for try_enliven_repo in "$HOME/Downloads/poikilos/EnlivenMinetest" "$HOME/Downloads/EnlivenMinetest" "$try_default_enliven_repo"
do do
if [ -d "$try_enliven_repo" ]; then if [ -d "$try_enliven_repo" ]; then
ENLIVEN_REPO="$try_enliven_repo" ENLIVEN_REPO="$try_enliven_repo"
echo "Detected ENLIVEN_REPO=\"$try_enliven_repo\""
else
echo "Tried \"$try_enliven_repo\" (not found)"
fi fi
done done
fi fi
source mtbuild.rc source mtbuild.rc
if [ $? -ne 0 ]; then
source "$ENLIVEN_REPO/mtbuild.rc"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error:" echo "Error:"
echo "source mtbuild.rc failed. Try adding it to the path or $try_default_enliven_repo (or set ENLIVEN_REPO)" echo "source mtbuild.rc failed. Try adding it to the path or $try_default_enliven_repo (or set ENLIVEN_REPO)"
exit 1 exit 1
fi fi
fi
if [ -z "$KEEP_MAKE" ]; then if [ -z "$KEEP_MAKE" ]; then

8
reset-minetest-install-source.sh

@ -259,21 +259,29 @@ fi
if [ -z "$DEPS_INSTALL" ]; then if [ -z "$DEPS_INSTALL" ]; then
DEPS_INSTALL= DEPS_INSTALL=
fi fi
printf "* detecting EnlivenMinetest..."
if [ -z "$ENLIVEN_REPO" ]; then if [ -z "$ENLIVEN_REPO" ]; then
try_default_enliven_repo="$HOME/git/EnlivenMinetest" try_default_enliven_repo="$HOME/git/EnlivenMinetest"
for try_enliven_repo in "$HOME/Downloads/poikilos/EnlivenMinetest" "$HOME/Downloads/EnlivenMinetest" "$try_default_enliven_repo" for try_enliven_repo in "$HOME/Downloads/poikilos/EnlivenMinetest" "$HOME/Downloads/EnlivenMinetest" "$try_default_enliven_repo"
do do
if [ -d "$try_enliven_repo" ]; then if [ -d "$try_enliven_repo" ]; then
ENLIVEN_REPO="$try_enliven_repo" ENLIVEN_REPO="$try_enliven_repo"
echo "Detected ENLIVEN_REPO=\"$try_enliven_repo\""
else
echo "Tried \"$try_enliven_repo\" (not found)"
fi fi
done done
fi fi
source mtbuild.rc source mtbuild.rc
if [ $? -ne 0 ]; then
source "$ENLIVEN_REPO/mtbuild.rc"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error:" echo "Error:"
echo "source mtbuild.rc failed. Try adding it to the path or $try_default_enliven_repo (or set ENLIVEN_REPO)" echo "source mtbuild.rc failed. Try adding it to the path or $try_default_enliven_repo (or set ENLIVEN_REPO)"
exit 1 exit 1
fi fi
fi
if [ $mtLibrariesCompileResult -ne 0 ]; then if [ $mtLibrariesCompileResult -ne 0 ]; then
cat "$extracted_path/libraries.log" cat "$extracted_path/libraries.log"
echo echo

Loading…
Cancel
Save