poikilos
/
EnlivenMinetest
mirror of https://github.com/poikilos/EnlivenMinetest
1
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity
Browse Source

Fix issues where the state of the source wasn't detected or fixed.

master
poikilos 5 years ago
parent
6304d246d3
commit
41678f78d2
2 changed files with 164 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      install-mts.sh
  2. 194
      reset-minetest-install-source.sh

9
install-mts.sh
View File

@ -68,9 +68,16 @@ dest_programs="$HOME"
EXTRACTED_SRC_NAME="linux-minetest-kit" EXTRACTED_SRC_NAME="linux-minetest-kit"
# EM_CONFIG_PATH is from "minetestenv-in-place.rc". # EM_CONFIG_PATH is from "minetestenv-in-place.rc".
EXTRACTED_SRC_PATH="$EM_CONFIG_PATH/$EXTRACTED_SRC_NAME" EXTRACTED_SRC_PATH="$EM_CONFIG_PATH/$EXTRACTED_SRC_NAME"
cd "$EM_CONFIG_PATH" || customExit "[$INSTALL_MTS_NAME] cd \"$EM_CONFIG_PATH\" failed."
flag_dir_rel="$EXTRACTED_SRC_NAME/mtsrc" flag_dir_rel="$EXTRACTED_SRC_NAME/mtsrc"
code_flag_dir_path="$EXTRACTED_SRC_PATH/mtsrc" code_flag_dir_path="$EXTRACTED_SRC_PATH/mtsrc"
if [ ! -d "$code_flag_dir_path" ]; then
echo
echo
echo "ERROR: The minetest sources directory \"$code_flag_dir_path\" is missing. Try running reset-minetest-install-source.sh first."
echo
exit 1
fi
cd "$EM_CONFIG_PATH" || customExit "[$INSTALL_MTS_NAME] cd \"$EM_CONFIG_PATH\" failed."
if [ -z "$CUSTOM_SCRIPTS_PATH" ]; then if [ -z "$CUSTOM_SCRIPTS_PATH" ]; then
CUSTOM_SCRIPTS_PATH="$HOME" CUSTOM_SCRIPTS_PATH="$HOME"
fi fi

194
reset-minetest-install-source.sh
View File

@ -1,4 +1,14 @@
#!/bin/bash #!/bin/bash
# ## Developer notes
# ### Error checking
# The following matches *may* be errors (no `$` before variable):
# - `-d "[^$ 1234567890@]`
# - `-f "[^$ 1234567890@]`
# - `-z "[^$ 1234567890@]`
# - `[ "[^$ 1234567890@]`
# - `= "[^$ 1234567890@]`
echo echo
echo echo
echo echo
@ -8,6 +18,11 @@ MY_NAME="reset-minetest-install-source.sh"
EM_CONFIG_PATH=$HOME/.config/EnlivenMinetest EM_CONFIG_PATH=$HOME/.config/EnlivenMinetest
zip_name=linux-minetest-kit.zip zip_name=linux-minetest-kit.zip
EM_TMP=/tmp/EnlivenMinetest
if [ ! -d "$EM_TMP" ]; then
mkdir -p "$EM_TMP"
fi
TMP_DL_PATH="$EM_TMP/$zip_name"
extracted_name=linux-minetest-kit extracted_name=linux-minetest-kit
EM_CONFIG_PATH=~/.config/EnlivenMinetest EM_CONFIG_PATH=~/.config/EnlivenMinetest
extracted_path="$EM_CONFIG_PATH/$extracted_name" extracted_path="$EM_CONFIG_PATH/$extracted_name"
@ -47,9 +62,13 @@ END
} }
customExit () { customExit () {
echo "ERROR: Cannot continue since" exitCode=1
if [ ! -z "$2" ]; then
exitCode=$2
fi
echo "ERROR:"
echo "$1" echo "$1"
exit 1 exit $exitCode
} }
available_release_line=`curl http://downloads.minetest.org/release.txt | head -n 1` available_release_line=`curl http://downloads.minetest.org/release.txt | head -n 1`
# echo "Release data: $available_release_line" # "Release *" where * is YYMMDD # echo "Release data: $available_release_line" # "Release *" where * is YYMMDD
@ -59,45 +78,131 @@ available_version=$(echo $available_release_line | awk '{print $2}')
if [ ${#available_version} -ne 6 ]; then if [ ${#available_version} -ne 6 ]; then
customExit "The available version is not recognized: $available_version" customExit "The available version is not recognized: $available_version"
fi fi
installed_release_line=`head -n 1 ~/minetest/release.txt` INSTALL_PATH="$HOME/minetest"
installed_release_line=`head -n 1 $INSTALL_PATH/release.txt`
installed_version=$(echo $installed_release_line | awk '{print $2}') installed_version=$(echo $installed_release_line | awk '{print $2}')
compiled_release_line=`head -n 1 ~/minetest/release.txt` compiled_release_line=`head -n 1 $extracted_path/release.txt`
compiled_version=$(echo $compiled_release_line | awk '{print $2}') extracted_path_msg=
echo "installed_version: $installed_version" if [ ! -d "$extracted_path" ]; then
echo "compiled_version: $compiled_version" extracted_path_msg="(not present)"
echo "available_version: $available_version"
if [ "@$installed_version" = "@$available_version" ]; then
echo "You already have the latest version installed."
exit 1
fi
if [ "@$compiled_version" != "@$installed_version" ]; then
echo "ERROR: You have not yet installed version $compiled_version which you already compiled (you have installed $installed_version)."
echo "You should run ./install-mts.sh instead (with --client option if you want more than minetestserver)"
exit 2
fi fi
compiled_version=$(echo $compiled_release_line | awk '{print $2}')
echo "installed_version: $installed_version ($INSTALL_PATH/release.txt)"
echo "compiled_version: $compiled_version$extracted_path_msg ($extracted_path/release.txt)"
echo "available_version: $available_version ($release_txt_url)"
enable_offline=false enable_offline=false
enable_keep=false enable_keep=false
enable_rebuild=false
for var in "$@" for var in "$@"
do do
if [ "@$var" = "@--offline" ]; then if [ "@$var" = "@--offline" ]; then
enable_offline=true enable_offline=true
elif [ "@$var" = "@--keep" ]; then elif [ "@$var" = "@--keep" ]; then
enable_keep=true enable_keep=true
elif [ "@$var" = "@--rebuild" ]; then
enable_rebuild=true
else else
customExit "Invalid argument: $var" customExit "Invalid argument: $var"
fi fi
done done
if [ "@$installed_version" = "@$available_version" ]; then
if [ "@$enable_rebuild" = "@false" ]; then
echo "You already have the latest version. Use the \"--rebuild\" option to rebuild anyway."
exit 1
fi
fi
if [ "@$compiled_version" != "@$installed_version" ]; then
if [ ! -z "$compiled_version" ]; then
echo "ERROR: You have not yet installed version $compiled_version which you already compiled (you have installed $installed_version)."
echo "You should run ./install-mts.sh instead (with --client option if you want more than minetestserver)"
exit 2
else
# You do not have the source code at all.
if [ "@$installed_version" = "@$available_version" ]; then
echo "WARNING: You already have release $installed_version, but the source code preparation will continue since you do not have a detectable version of the source code (no release.txt containing \"Release <release>\")."
else
echo "* The source code preparation will continue since you do not have a detectable version of the source code (no release.txt containing \"Release <release>\")."
fi
fi
fi
cd "$EM_CONFIG_PATH" || customExit "[$MY_NAME] cd \"$EM_CONFIG_PATH\" failed." cd "$EM_CONFIG_PATH" || customExit "[$MY_NAME] cd \"$EM_CONFIG_PATH\" failed."
if [ "@$enable_keep" = "@true" ]; then if [ "@$enable_keep" = "@true" ]; then
enable_offline=true enable_offline=true
fi fi
if [ ! -z "$compiled_version" ]; then
if [ "$compiled_version" = "$available_version" ]; then
enable_offline=true
echo "* --offline has been automatically enabled since the compiled_version $compiled_version is the same as the available version."
fi
fi
if [ "@$enable_keep" != "@true" ]; then if [ "@$enable_offline" = "@true" ]; then
if [ ! -f "$zip_name" ]; then
if [ "@$enable_keep" = "@true" ]; then
if [ ! -d "$extracted_path" ]; then
customExit "* Offline install is impossible without '`pwd`/$zip_name' (or '$extracted_path' with the --keep option)."
else
echo "* keeping existing \"$extracted_path\"..."
fi
else
customExit "* Offline install is impossible without '`pwd`/$zip_name' (or '$extracted_path' when using the --keep option)."
fi
fi
else
if [ -d "$EM_CONFIG_PATH/$zip_name" ]; then
customExit "Remove the invalid directory \"$EM_CONFIG_PATH/$zip_name\" first so that a file with that path can be created."
fi
if [ -d "$TMP_DL_PATH" ]; then
customExit "Remove the invalid directory \"$TMP_DL_PATH\" first so that a file with that path can be created."
fi
if [ ! -f "`command -v wget`" ]; then
# if [ ! -f "`command -v curl`" ]; then
# customExit "You must install curl or wget to use this script."
# fi
curl $url/$zip_name -o "$TMP_DL_PATH"
if [ $? -ne 0 ]; then
# This is necessary on cygwin for some reason.
curl $url/$zip_name > "$TMP_DL_PATH"
if [ $? -ne 0 ]; then
if [ -f "$TMP_DL_PATH" ]; then
rm "$TMP_DL_PATH"
fi
customExit "curl $url/$zip_name failed."
fi
fi
else
wget -O "$TMP_DL_PATH" $url/$zip_name
if [ $? -ne 0 ]; then
if [ -f "$TMP_DL_PATH" ]; then
rm "$TMP_DL_PATH"
fi
customExit "wget $url/$zip_name failed to write $TMP_DL_PATH."
fi
fi
mv "$TMP_DL_PATH" "$EM_CONFIG_PATH/$zip_name"
if [ $? -ne 0 ]; then
customExit "mv \"$TMP_DL_PATH\" \"$EM_CONFIG_PATH/$zip_name\" failed."
fi
echo "* moved the sucessful download to \"$EM_CONFIG_PATH/$zip_name\""
fi
if [ "@$enable_keep" = "@true" ]; then
if [ ! -d "$extracted_path" ]; then
enable_keep=false
echo "* WARNING: --keep is not possible when $extracted_path does not exist, so the option has been automatically turned off."
fi
fi
if [ "@$enable_keep" = "@true" ]; then
echo "* using existing $extracted_path since \"--keep\" is enabled"
else
if [ -d "$extracted_path" ]; then if [ -d "$extracted_path" ]; then
# NOTE: ls -lR provides a count, so it is not suitable unless output # NOTE: ls -lR provides a count, so it is not suitable unless output
# is parsed. `| wc -l` is easier (word count). # is parsed. `| wc -l` is easier (word count).
screenshot_count=0 screenshot_count=0
if [ -d $extracted_path/screenshots ]; then if [ -d "$extracted_path/screenshots" ]; then
screenshot_count=`ls $extracted_path/screenshots/*.png | wc -l` screenshot_count=`ls $extracted_path/screenshots/*.png | wc -l`
fi fi
if [ $screenshot_count -gt 0 ]; then if [ $screenshot_count -gt 0 ]; then
@ -107,43 +212,54 @@ if [ "@$enable_keep" != "@true" ]; then
if [ `ls $extracted_path/minetest/bin/*.png | wc -l` -gt 0 ]; then if [ `ls $extracted_path/minetest/bin/*.png | wc -l` -gt 0 ]; then
# if [ ! -d screenshots ]; then mkdir screenshots; fi # if [ ! -d screenshots ]; then mkdir screenshots; fi
# NOTE: system-wide install of minetest puts screenshots in ~/ (cwd) # NOTE: system-wide install of minetest puts screenshots in ~/ (cwd)
mv $extracted_path/minetest/bin/*.png ~/ || customExit "can't move screenshots from $extracted_path/minetest/bin/*.png" mv $extracted_path/minetest/bin/*.png ~/ || customExit "can't move png screenshots from $extracted_path/minetest/bin/*.png"
fi
if [ `ls $extracted_path/minetest/bin/*.jpg | wc -l` -gt 0 ]; then
# if [ ! -d screenshots ]; then mkdir screenshots; fi
# NOTE: system-wide install of minetest puts screenshots in ~/ (cwd)
mv $extracted_path/minetest/bin/*.jpg ~/ || customExit "can't move jpg screenshots from $extracted_path/minetest/bin/*.png"
fi fi
echo "* removing old \"$extracted_path\" (since you did not specify \"--keep\")"
rm -Rf "$extracted_path" || customExit "can't remove $extracted_name" rm -Rf "$extracted_path" || customExit "can't remove $extracted_name"
fi fi
fi fi
if [ "@$enable_offline" = "@true" ]; then
if [ ! -f "$zip_name" ]; then
if [ "@$enable_keep" = "@true" ]; then
if [ ! -d "$extracted_path" ]; then if [ ! -d "$extracted_path" ]; then
customExit "* Offline install is impossible without '`pwd`/$zip_name' (or '$extracted_path' with the --keep option)." if [ ! -f "`command -v unzip`" ]; then
else customExit "unzip is missing. You must install it or manually extract $zip_name to \"$extracted_path\" to use this script."
echo "* keeping existing \"$extracted_path\"..."
fi
else
customExit "* Offline install is impossible without '`pwd`/$zip_name' (or '$extracted_path' when using the --keep option)."
fi
fi fi
else unzip -u $zip_name || customExit "unzip \"$zip_name\" failed in \"`pwd`\". Try removing it and re-downloading it."
wget -O "$EM_CONFIG_PATH/$zip_name" $url/$zip_name || customExit "no $zip_name at $url" # if [ ! -d "" ]; then
fi # customExit "Unzipping \"$zip_name\" in \"`pwd`\" did not result in a readable directory named \"$extracted_name\" there."
if [ "@$enable_keep" = "@true" ]; then # fi
if [ ! -d "$extracted_path" ]; then if [ ! -d "$extracted_name" ]; then
unzip -u $zip_name || customExit "Can't unzip $zip_name" customExit "Unzipping \"$zip_name\" in \"`pwd`\" did not result in a readable directory named \"$extracted_name\" there."
cd "$extracted_name" || customExit "Unzipping \"$zip_name\" in \"`pwd`\" did not result in a readable directory named \"$extracted_name\" there."
else
cd "$extracted_name" || customExit "There is no readable directory: \"`pwd`\" (that or the zip is necessary for --keep)."
fi fi
#else
# if [ ! -d "$extracted_name" ]; then
# customExit "There is no readable directory: \"`pwd`\" (that or the zip is necessary for --keep)."
# fi
fi fi
cd "$extracted_path" || customExit "cd \"`pwd`\" failed."
cat "$extracted_path/release.txt" cat "$extracted_path/release.txt"
echo "If you already compiled the libraries in `pwd`, run install-mts.sh to install minetest from source (with the --client option to include the client)"
echo "compiling libraries..." echo "compiling libraries..."
date date
start=`date +%s` start=`date +%s`
if [ ! -f "`command -v patch`" ]; then
customExit "patch is missing. You must install patch to use mtcompile-libraries.sh in linux-minetest-kit. Ubuntu: sudo apt install -y patch Fedora: sudo dnf install -y patch"
fi
bash -e mtcompile-libraries.sh build >& libraries.log bash -e mtcompile-libraries.sh build >& libraries.log
mtLibrariesCompileResult=$?
if [ $mtLibrariesCompileResult -ne 0 ]; then
customExit "ERROR: Compiling libraries failed (code $mtLibrariesCompileResult). See $extracted_path/libraries.log" $mtLibrariesCompileResult
fi
end=`date +%s` end=`date +%s`
compile_time=$((end-start)) compile_time=$((end-start))
echo "Compiling libraries finished in $compile_time seconds." echo "Compiling libraries finished in $compile_time seconds."
echo " (see libraries.log in case of any errors)" echo " (see $extracted_path/libraries.log in case of any errors)"
#echo "compiling program..." #echo "compiling program..."
#bash -e mtcompile-program.sh build >& program.log #bash -e mtcompile-program.sh build >& program.log
echo "done." echo "done."

Write Preview
Loading…
Cancel
Save