changes for varying distros

etc/game-install-ENLIVEN

@@ -34,7 +34,7 @@ err_txt=$HOME/err-enliven.txt
 # doesn't work if equal: [ $0 = *"$shell_name"* ]
 # could be -bash or bash
 #if [ "$0" = "-bash" ]; then
-if [[ $0 == *"$shell_name"* ]]; then
+if [ $0 == *"$shell_name"* ]; then
   REPO_PATH="$HOME/GitHub/EnlivenMinetest"
   echo "You must have pasted this into terminal, so assuming REPO_PATH:"
   echo "  $REPO_PATH"
@@ -419,7 +419,8 @@ if [ -d "$USR_SHARE_MINETEST/games/minetest" ]; then
   # Arch linux
   mtgame_name="minetest"
 fi
-sudo cp -Rf $USR_SHARE_MINETEST/games/$mtgame_name/* "$MT_MYGAME_DIR/"
+MT_MINETEST_GAME_PATH=$USR_SHARE_MINETEST/games/$mtgame_name
+sudo cp -Rf $MT_MINETEST_GAME_PATH/* "$MT_MYGAME_DIR/"
 
 
 
@@ -508,6 +509,9 @@ add_git_mod vote vote https://github.com/minetest-mods/vote.git
 #endregion UTILITY MODS
 
 #region MOB AND WORLDGEN MODS
+# forum_url="https://forum.minetest.net/viewtopic.php?id=7263"
+# TESTED: with mg, tsm_railcorridors sometimes have chests with loot (using seed BagEnd; /teleport 188,-304.5,-120)
+add_git_mod mg mg https://github.com/minetest-mods/mg.git
 add_git_mod worldedge worldedge https://github.com/minetest-mods/worldedge.git
 #wget https://github.com/BlockMen/cme/releases/download/v2.3/cme-2_3-BlockMen.zip
 #unzip cme-2_3-BlockMen.zip
@@ -574,13 +578,18 @@ if [ "$spawners_enable" = "true" ]; then
     echo "SPAWN_PYRAMIDS = true" > settings.txt
     echo "SPAWNERS_GENERATE = true" >> settings.txt
     echo "CHESTS_GENERATE = false" >> settings.txt
-    sudo mv settings.txt "$MTMOD_DEST_PATH/"  # formerly $MT_MYGAME_MODS_PATH/spawners/
+    sudo mv settings.txt "$MTMOD_DEST_PATH/"  # formerly $MT_MYGAME_MODS_PATH/spawners/, now is spawners/spawners_env/
     echo "NOTE: in spawners, only SPAWNERS_GENERATE or CHESTS_GENERATE, not both (chests seem to override) spawn in world for now. See thread for updated info: https://forum.minetest.net/viewtopic.php?f=11&t=13857&start=25"
     echo "see also expertmm's game-install-enliven-testing-SPAWNERS_BOTH_DEBUG.txt"
 
-    # NOTE: tsm_chests_dungeon supercedes dungeon_loot:
+    # NOTE: tsm_chests_dungeon supercedes dungeon_loot, but dungeon_loot :
     if [ -d "$MT_MYGAME_MODS_PATH/dungeon_loot" ]; then
       echo "WARNING: tsm_chests_dungeon may not be compatible with dungeon_loot"
+      if [ -d "$MT_MYGAME_MODS_PATH/tsm_chests_dungeon" ]; then
+        echo "so removing tsm_chests_dungeon"
+      else
+        echo "so skipping tsm_chests_dungeon"
+      fi
       echo "press Ctrl C to cancel installing ENLIVEN"
       sleep 2
       echo "4..."
@@ -591,8 +600,12 @@ if [ "$spawners_enable" = "true" ]; then
       sleep 1
       echo "1..."
       sleep 1
+      if [ -d "$MT_MYGAME_MODS_PATH/tsm_chests_dungeon" ]; then
+        remove_mod tsm_chests_dungeon
       fi
+    else
       add_git_mod tsm_chests_dungeon minetest_tsm_chests_dungeon http://repo.or.cz/minetest_tsm_chests_dungeon.git
+    fi
 else
   remove_mod tsm_chests_dungeon
   remove_mod spawners
@@ -1128,4 +1141,4 @@ 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"
 fi
-echo "(used $MT_GAMES_DIR as base)"
+echo "(used $MT_MINETEST_GAME_PATH as base)"

etc/game-install-testing.sh

@@ -65,8 +65,6 @@ add_git_mod special_picks special_picks https://github.com/cx384/special_picks.g
 # no longer needed since ENLIVEN main branch now uses expertmm travelnet:
 # add_git_mod travelnet travelnet https://github.com/Sokomine/travelnet.git
 
-add_git_mod mg mg https://github.com/minetest-mods/mg.git
-
 #used by mg_villages fork by Sokomine
 add_git_mod handle_schematics handle_schematics https://github.com/Sokomine/handle_schematics.git
 # mg_villages no longer needed (?) since minetest-mods now maintains an mg with villages