From 6f0185fc967ae43fc5524fae587025381ad1276f Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Fri, 13 Apr 2018 09:04:46 -0400
Subject: [PATCH] made variable names match install script

and made bones logic more paranoid
---
 etc/minetestserver-update-from-git.sh | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/etc/minetestserver-update-from-git.sh b/etc/minetestserver-update-from-git.sh
index 6f3c69d..bbb99f3 100755
--- a/etc/minetestserver-update-from-git.sh
+++ b/etc/minetestserver-update-from-git.sh
@@ -30,27 +30,27 @@ if [ -d "$HOME/Downloads/minetest" ]; then
   #git fetch
   #git checkout HEAD games/minetest_game
   sudo make install
-
-  MT_GAMES_DIR="/usr/local/share/minetest/games"
+  USR_SHARE_MINETEST="/usr/local/share/minetest"
+  MT_GAMES_DIR="$USR_SHARE_MINETEST/games"
   if [ -d "$MT_GAMES_DIR/minetest_game" ]; then
     if [ ! -d "$MT_GAMES_DIR/minetest_game" ]; then
       sudo mkdir -p "$MT_GAMES_DIR/minetest_game"
     fi
-    MY_SUBGAME_PATH="$MT_GAMES_DIR/ENLIVEN"
-    if [ -d "$MY_SUBGAME_PATH" ]; then
+    MT_MYGAME_DIR="$MT_GAMES_DIR/ENLIVEN"
+    if [ -d "$MT_MYGAME_DIR" ]; then
       echo "updating "
-      sudo rsync -rtv "$HOME/Downloads/minetest/games/minetest_game/mods/" "$MY_SUBGAME_PATH/mods/"
-      if [ -d "$MY_SUBGAME_PATH/mods/tsm_chests_dungeon" ]; then
+      sudo rsync -rtv "$HOME/Downloads/minetest/games/minetest_game/mods/" "$MT_MYGAME_DIR/mods/"
+      if [ -d "$MT_MYGAME_DIR/mods/tsm_chests_dungeon" ]; then
         echo "REMOVING dungeon_loot since tsm_chests_dungeon is installed (even though more than one should work now since https://github.com/minetest/minetest/issues/6590 is resolved, dungeon_loot would be redundant in this case)..."
-        sudo rm -Rf "$MY_SUBGAME_PATH/mods/dungeon_loot"
+        sudo rm -Rf "$MT_MYGAME_DIR/mods/dungeon_loot"
       fi
     else
       echo "skipping update of components from minetest_game since does not exist: "
-      echo "  $MY_SUBGAME_PATH"
+      echo "  $MT_MYGAME_DIR"
     fi
     echo "patching bones (this will not be needed after https://github.com/minetest/minetest_game/pull/2082 is merged)..."
-    if [ -d "$MY_SUBGAME_PATH/mods/bones" ]; then
-      cd "$MY_SUBGAME_PATH/mods/bones"
+    if [ -f "$MT_MYGAME_DIR/mods/bones/init.lua" ]; then
+      cd "$MT_MYGAME_DIR/mods/bones"
       if [ -f init.bak ]; then
         sudo rm init.bak
       fi
@@ -67,13 +67,13 @@ if [ -d "$HOME/Downloads/minetest" ]; then
         git pull
         cd ..
       fi
-      sudo rm -Rf "$MY_SUBGAME_PATH/mods/farming"
-      sudo cp -Rf farming "$MY_SUBGAME_PATH/mods/"
-      sudo rm -Rf "$MY_SUBGAME_PATH/mods/farming/.git"
-      sudo rm "$MY_SUBGAME_PATH/mods/farming/screenshot.png"
-      sudo rm "$MY_SUBGAME_PATH/mods/farming/.gitignore"
+      sudo rm -Rf "$MT_MYGAME_DIR/mods/farming"
+      sudo cp -Rf farming "$MT_MYGAME_DIR/mods/"
+      sudo rm -Rf "$MT_MYGAME_DIR/mods/farming/.git"
+      sudo rm "$MT_MYGAME_DIR/mods/farming/screenshot.png"
+      sudo rm "$MT_MYGAME_DIR/mods/farming/.gitignore"
     else
-      echo "ERROR: missing '$MY_SUBGAME_PATH/mods/bones'"
+      echo "ERROR: missing '$MT_MYGAME_DIR/mods/bones/init.lua'"
     fi
   else
     echo "WARNING: could not find $MT_GAMES_DIR/minetest_game"