diff --git a/CHANGELOG.md b/CHANGELOG.md index 6107d94..31a868e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [git] - 2020-03-11 +### Changed +- Generate readme-ENLIVEN.md `game-release.rc` when building ENLIVEN-mtg + instead of emitting instructions to standard output and creating flag + files. + - `game-release.rc` stores information the script needs to read upon + later runs (The file is now used instead of flag files). + - `readme-ENLIVEN.md` stores information for the user or developer. +- Rename variables in `minetestenv.rc`. + +### Fixed +- Use the new awards URL. + ## [git] - 2020-02-27 ### Added - new super for map generators diff --git a/minetestenv.rc b/minetestenv.rc index 91d26d8..017c19d 100644 --- a/minetestenv.rc +++ b/minetestenv.rc @@ -95,22 +95,22 @@ if [ "$1" = "--help" ]; then echo "This script installs ENLIVEN subgame for minetest. It uses individual git repositories, so please only run this once so as not to exceed their bandwidth." echo "Usage:" echo - #echo "version_0_5_enable= (where value is true or false): forces 0.5 (if not specified, this script uses 0.5 versions of mods if minetest is at /usr/local/share/minetest)" + #echo "enable_version_0_5= (where value is true or false): forces 0.5 (if not specified, this script uses 0.5 versions of mods if minetest is at /usr/local/share/minetest)" #echo echo "local_enable= (where value is true or false): forces /usr/local/share/minetest (if not specified, script detects minetest but if exists both in /usr/share/ and /usr/local/share, prefers /usr/local/share/minetest)" echo exit 0 fi -#NOTE: version_0_5_enable is now detected further down instead of being specified -#if [ "$1" = "version_0_5_enable=true" ]; then -# version_0_5_enable="true" -#elif [ "$2" = "version_0_5_enable=true" ]; then -# version_0_5_enable="true" -#elif [ "$1" = "version_0_5_enable=false" ]; then -# version_0_5_enable="false" -#elif [ "$2" = "version_0_5_enable=false" ]; then -# version_0_5_enable="false" +#NOTE: enable_version_0_5 is now detected further down instead of being specified +#if [ "$1" = "enable_version_0_5=true" ]; then +# enable_version_0_5="true" +#elif [ "$2" = "enable_version_0_5=true" ]; then +# enable_version_0_5="true" +#elif [ "$1" = "enable_version_0_5=false" ]; then +# enable_version_0_5="false" +#elif [ "$2" = "enable_version_0_5=false" ]; then +# enable_version_0_5="false" #fi if [ "$1" = "local_enable=true" ]; then @@ -195,27 +195,27 @@ if [ "$local_enable" != "false" ]; then # IF git version is installed try_path="/usr/local/share/minetest" if [ -d "$try_path" ]; then - #if [ -z "$version_0_5_enable" ]; then - # version_0_5_enable="true" + #if [ -z "$enable_version_0_5" ]; then + # enable_version_0_5="true" #fi USR_SHARE_MINETEST="$try_path" fi fi -version_0_5_enable="false" +enable_version_0_5="false" if [ -d "$USR_SHARE_MINETEST/games/minetest_game/mods/player_api" ]; then - version_0_5_enable="true" + enable_version_0_5="true" fi if [ -f "$CONFIG_PATH/local_enable" ]; then local_enable=$(head -n 1 $CONFIG_PATH/local_enable) fi -#if [ -f "$CONFIG_PATH/version_0_5_enable" ]; then -# version_0_5_enable=$(head -n 1 $CONFIG_PATH/version_0_5_enable) +#if [ -f "$CONFIG_PATH/enable_version_0_5" ]; then +# enable_version_0_5=$(head -n 1 $CONFIG_PATH/enable_version_0_5) #fi if [ -z "$local_enable" ]; then echo "$local_enable" > "$CONFIG_PATH/local_enable" fi -#if [ -z "$version_0_5_enable" ]; then -# echo "$version_0_5_enable" > "$CONFIG_PATH/version_0_5_enable" +#if [ -z "$enable_version_0_5" ]; then +# echo "$enable_version_0_5" > "$CONFIG_PATH/enable_version_0_5" #fi mtgame_name="minetest_game" @@ -236,6 +236,7 @@ MT_MYGAME_DIR="$MT_MYGAMES_DIR/$MT_MYGAME_NAME" # formerly MT_MYGAME_MODDIR: MT_MYGAME_MODS_PATH="$MT_MYGAME_DIR/mods" MT_WORLDS_DIR="$HOME/.minetest/worlds" +echo "Worlds in '$MT_WORLDS_DIR':" MT_DEFAULT_WORLD_NAME="`ls $MT_WORLDS_DIR | grep -v tar.gz | grep --max-count=1 -v world`" # aka -m 1 (no '=' sign in that case) MT_MYWORLD_NAME="$MT_DEFAULT_WORLD_NAME" if [ -z "$MT_DEFAULT_WORLD_NAME" ]; then @@ -501,13 +502,13 @@ echo echo echo "To preconfigure, write true or false to files in $CONFIG_PATH named:" echo " local_enable" -#echo " version_0_5_enable" +#echo " enable_version_0_5" echo echo "Using following configuration:" -#if [ -z "$version_0_5_enable" ]; then -# echo " version_0_5_enable: (auto--set this var before pasting region into terminal)" +#if [ -z "$enable_version_0_5" ]; then +# echo " enable_version_0_5: (auto--set this var before pasting region into terminal)" #else -echo " version_0_5_enable: $version_0_5_enable" +echo " enable_version_0_5: $enable_version_0_5" #fi if [ -z "$local_enable" ]; then echo " local_enable: (auto--set this var before pasting region into terminal)" diff --git a/utilities/extra/install-ENLIVEN-minetest_game.sh b/utilities/extra/install-ENLIVEN-minetest_game.sh index c39858a..f91a177 100755 --- a/utilities/extra/install-ENLIVEN-minetest_game.sh +++ b/utilities/extra/install-ENLIVEN-minetest_game.sh @@ -133,14 +133,22 @@ if [ -z "$MT_MYGAME_DIR" ]; then exit 1 fi +BUILD_DATE=`date '+%Y-%m-%d'` + # BACKUP world.mt: if [ ! -d "$MT_MYGAME_DIR" ]; then mkdir "$MT_MYGAME_DIR" || customDie "$USER cannot mkdir '$MT_MYGAME_DIR' (make sure the directory containing it exists)" show_changes="false" -#else -# # workaround bug in earlier version of installer -# sudo chown -R `cat /tmp/local_mts_user` "$MT_MYGAME_DIR" +# else +# # workaround bug in earlier version of installer +# sudo chown -R `cat /tmp/local_mts_user` "$MT_MYGAME_DIR" +fi +release_rc="$MT_MYGAME_DIR/game-release.rc" +if [ -f "$release_rc" ]; then + source "$release_rc" fi +# WAIT to echo build date until end, to ensure annotated correctly +echo "# build_started=`date`" > "$release_rc" if [ -f "$MT_MYWORLD_DIR/world.mt.1st" ]; then echo "Already backed up world.mt to $MT_MYWORLD_DIR/world.mt.1st" else @@ -284,7 +292,8 @@ echo "sprint_stamina_drain = .5" >> "$MYGAME_MINETEST_CONF" # default is 2 echo "bones_position_message = true" >> "$MYGAME_MINETEST_CONF" # default is false--this is for client-side chat message (server-side logging always on though) #no longer needed since these mods check for player_api to determine whether v3 model is used: #TODO: below must go in the one in the subgame folder! -if [ "$version_0_5_enable" = "true" ]; then +echo "enable_version_0_5=\"$enable_version_0_5\"" >> "$release_rc" +if [ "$enable_version_0_5" = "true" ]; then # echo "player_model_version = default_character_v3" >> "$MYGAME_MINETEST_CONF" # formerly used by playeranim echo "playeranim.model_version = MTG_4_Nov_2017" >> "$MYGAME_MINETEST_CONF" # used by playeranim echo "using version 5 branch of mods..." @@ -363,8 +372,9 @@ add_git_mod mob_horse mob_horse https://notabug.org/tenplus1/mob_horse.git # add_git_mod mobs_sky mobs_sky https://github.com/blert2112/mobs_sky.git add_git_mod mobs_sky mobs_sky https://github.com/poikilos/mobs_sky.git -spawners_enable="true" -if [ "$spawners_enable" = "true" ]; then +enable_spawners="true" +echo "enable_spawners=\"$enable_spawners\"" >> "$release_rc" +if [ "$enable_spawners" = "true" ]; then # forum_url: https://forum.minetest.net/viewtopic.php?f=11&t=13857 # description: # * NO LONGER REPLACES pyramids. @@ -438,7 +448,6 @@ if [ "$spawners_enable" = "true" ]; then # but first see if there are any updates to https://repo.or.cz/minetest_pyramids/tsm_pyramids.git # (WARNING: uses nodeupdate [not minetest.check_for_falling], so only compatible with minetest.org release # see nodes.lua; human readable url: http://repo.or.cz/w/minetest_pyramids/tsm_pyramids.git) - else remove_mod tsm_chests_dungeon remove_mod spawners @@ -656,7 +665,7 @@ add_git_mod ts_furniture ts_furniture https://github.com/minetest-mods/ts_furnit #"stable" version is at https://github.com/stujones11/minetest-3d_armor/archive/version-0.4.11.zip #add_zip_mod 3d_armor minetest-3d_armor-MT_0.5.0-dev https://github.com/stujones11/minetest-3d_armor/archive/MT_0.5.0-dev.zip # git clone -b MT_0.5.0-dev --single-branch https://git@github.com/stujones11/minetest-3d_armor.git -#if [ "$version_0_5_enable" = "true" ]; then +#if [ "$enable_version_0_5" = "true" ]; then # # this branch doesn't exist anymore. See main branch. # echo " trying to get 3d_armor 0.5.0-dev branch..." # add_git_mod 3d_armor minetest-3d_armor https://github.com/stujones11/minetest-3d_armor.git "MT_0.5.0-dev" @@ -684,6 +693,7 @@ add_git_mod sling sling https://github.com/minetest-mods/sling.git add_git_mod signs_lib signs_lib https://gitlab.com/VanessaE/signs_lib.git farming_redo_enable="false" +echo "farming_redo_enable=\"$farming_redo_enable\"" >> "$release_rc" if [ -f "$MT_MYWORLD_DIR/farming_redo_enable" ]; then farming_redo_enable="true" else @@ -722,8 +732,9 @@ add_git_mod digilines digilines https://github.com/minetest-mods/digilines.git add_git_mod trmp_minetest_game trmp_minetest_game https://github.com/poikilos/trmp_minetest_game.git #forum_url = "http://minetest.org/forum/viewtopic.php?f=11&t=4870&sid=3ccbe3a667c6201075fc475ef7dc7cea" -#see also minetest-mods version: -add_git_mod awards awards https://github.com/minetest-mods/awards.git +# minetest-mods version MOVED to https://gitlab.com/rubenwardy/awards.git: +# add_git_mod awards awards https://github.com/minetest-mods/awards.git +add_git_mod awards awards https://gitlab.com/rubenwardy/awards.git # xisd is GONE from GitHub: # add_git_mod awards_board awards_board https://github.com/xisd/awards_board.git # poikilos/awards_board is DELETED from GitLab (due to exposed e-mail address @@ -794,7 +805,7 @@ add_git_mod ambience ambience https://notabug.org/tenplus1/ambience.git # forum_url: https://forum.minetest.net/viewtopic.php?t=12189 # description: ISSUE ON 0.5.0: player halfway into ground--see minetest.conf setting above for fix; Adds animations to the players' head add_git_mod playeranim playeranim https://github.com/minetest-mods/playeranim.git -#if [ "$version_0_5_enable" != "true" ]; then +#if [ "$enable_version_0_5" != "true" ]; then # see https://github.com/minetest-mods/playeranim/issues/14 (fixed) # add_git_mod playeranim playeranim https://github.com/poikilos/playeranim.git #add_git_mod playeranim playeranim https://github.com/minetest-mods/playeranim.git "v5.0" @@ -818,7 +829,7 @@ MATCHING_MODS_BEFORE="`ls $MT_MYGAME_MODS_PATH | grep skin`" remove_mod u_skinsdb remove_mod u_skins PATCH_SKINS_MOD_NAME="skinsdb" # used further down too! -#if [ "$version_0_5_enable" = "true" ]; then +#if [ "$enable_version_0_5" = "true" ]; then # # There is only one branch now. See master instead. # #players are 1 block below ground in skinsdb for Minetest 0.4.* stable... # #so get 0.5 branch from fork... @@ -973,7 +984,7 @@ else customDie "did not find $PATCHES_PATH" fi echo -if [ "$version_0_5_enable" != "true" ]; then +if [ "$enable_version_0_5" != "true" ]; then echo " [ - ] removing worldedit's worldedit_brush since not compatible with 0.4.* stable (detected)" rm -Rf $MT_MYGAME_MODS_PATH/worldedit/worldedit_brush else @@ -984,12 +995,58 @@ fi echo echo echo -echo "#### $WORLD_MT_PATH: ####" -cat "$WORLD_MT_PATH" -echo "### end $WORLD_MT_PATH ##" -echo "" -echo "" -echo "" +cat > "$MT_MYGAME_DIR/readme-ENLIVEN.md" < + + +## Install +### Windows +Click "Download ENLIVEN" at + +for an older version. + +### Linux + +#### MT6 +The new version is based on Final Minetest, but not much is done +yet. Fortunately, since it is based on Bucket_Game, it has most of the +mods from the deprecated version (found in the Windows installer +or by running the `install-ENLIVEN-minetest_game.sh` script). + +#### MT5 +- A nearly complete but unmaintained version is installed by running the + following: + +```bash +git clone https://github.com/poikilos/EnlivenMinetest.git +cd EnlivenMinetest +./utilities/extra/install-ENLIVEN-minetest_game.sh +``` +END +echo "WORLD_MT_PATH=$WORLD_MT_PATH" + ##echo "Remember, if you are using Better HUD + Hunger, add the values for the new meat to hunger.lua" ##echo "--see " #echo "NOTE: hud_hunger/hunger/food.lua now comes with values for food from mobs." @@ -1024,14 +1081,15 @@ echo "" echo "#more minetest.conf settings for hbsprint can be found at https://github.com/minetest-mods/hbsprint/blob/master/settingtypes.txt" echo "#not all settings can be changed in this minetest.conf (see minetest.conf.example in THIS folder)" echo "#some settings can only be changed in client's local copy of minetest.conf (see or login scripts in network)" -if [ "$version_0_5_enable" = "true" ]; then +if [ "$enable_version_0_5" = "true" ]; then echo "The 0.5 version of mods was installed." else echo "The non-0.5 version of mods was installed (if you have installed a development version of minetest to /usr/share such as via an AUR package, you must instead run:" - echo "./game-install-ENLIVEN version_0_5_enable" + echo "# (In the EnlivenMinetest directory)" + echo "./utilities/extra/install-ENLIVEN-minetest_game.sh enable_version_0_5" fi echo "(used $MT_MINETEST_GAME_PATH as base)" -echo "spawners_enable: $spawners_enable" +echo "enable_spawners: $enable_spawners" echo echo "As for world.mt, the following WORLD_MT_PATH was used: $WORLD_MT_PATH" echo " content:" @@ -1072,7 +1130,8 @@ if [ ! -d "$MT_MYGAME_MODS_PATH/dungeon_loot" ]; then fi echo "INSTALLED t4im's technic FOR RECENT PATCH FOR corrected depends.txt..." echo "You must manually fix crash in awards unless it has been fixed:" -echo "see also " +echo "formerly at " +echo "moved to https://gitlab.com/rubenwardy/awards" echo "in $MT_MYGAME_MODS_PATH/awards/src/api_triggers.lua" echo "change:" echo "assert(player and player.is_player and player:is_player() and key)" @@ -1109,8 +1168,15 @@ else echo "WARNING: neither minetestserver nor minetest is in the system path" fi -# if [ ! -z "`cat "$err_txt"`" ]; then -cat "$err_txt" -# fi +if [ ! -s "$err_txt" ]; then + # -s: exists and is not blank + echo "There are errors in the error log:" + cat "$err_txt" +else + echo "$err_txt does not contain any errors." +fi +echo "BUILD_DATE=$BUILD_DATE" >> "$release_rc" +echo +echo "See also \"$release_rc\"" echo echo