From 1b3318ec2f5bae0817a3b82d26bdee0a794efb05 Mon Sep 17 00:00:00 2001
From: sys4 <bricassa@sys4.fr>
Date: Fri, 5 Mar 2021 07:38:51 +0100
Subject: [PATCH] Fix install and upgrade scripts

---
 install.sh        |  2 +-
 minetest-dev.conf |  5 +++++
 upgrade.sh        | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/install.sh b/install.sh
index 40ce204..1e1264d 100755
--- a/install.sh
+++ b/install.sh
@@ -163,7 +163,7 @@ install_minetest_game() {
 	elif [[ $ver == "1.2" ]]; then
 	    branch="-b nalc-1.2"
 	elif [[ $ver == "1.3" || $ver == "stable" ]]; then
-	    branch="-b nalc-1.3"
+	    branch="-b master"
 	elif [[ $ver == "dev" ]]; then
 	    branch="-b nalc-dev"
 	fi
diff --git a/minetest-dev.conf b/minetest-dev.conf
index 1e03892..9303505 100644
--- a/minetest-dev.conf
+++ b/minetest-dev.conf
@@ -318,3 +318,8 @@ toolranks_levels = 80
 toolranks_level_digs = 5000
 toolranks_speed_multiplier = 4.0
 toolranks_use_multiplier = 4.0
+
+# tsm_mines
+mines_deep_min = -64
+mines_deep_max = -13800 # default -380
+mines_spawnfactor = 1.5
diff --git a/upgrade.sh b/upgrade.sh
index f9515d2..efa4829 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -115,8 +115,16 @@ regen_worldmt() {
     ls $mods_path | while read -r mod; do
 	if [[ -d $mods_path/$mod ]]; then
 	    ln -s $mods_path/$mod $mods_minetest/$mod
-	    
-	    if [[ -e $mods_path/$mod/modpack.txt || -e $mods_path/$mod/modpack.conf ]]; then
+
+	    if [[ -e $mods_path/$mod/init.lua ]]; then
+		local mod_enable="true"
+		for (( modn=1; modn<=$i; modn++ )); do
+		    if [[ ${md[$modn]} == $mod ]]; then
+			mod_enable="false"
+		    fi
+		done
+		echo "load_mod_$mod = $mod_enable" >> /tmp/world.mt
+	    else
 		ls $mods_path/$mod | while read -r submod; do
 		    if [[ -d $mods_path/$mod/$submod ]]; then
 			local mod_enable="true"
@@ -128,14 +136,6 @@ regen_worldmt() {
 			echo "load_mod_$submod = $mod_enable" >> /tmp/world.mt
 		    fi
 		done
-	    else
-		local mod_enable="true"
-		for (( modn=1; modn<=$i; modn++ )); do
-		    if [[ ${md[$modn]} == $mod ]]; then
-			mod_enable="false"
-		    fi
-		done
-		echo "load_mod_$mod = $mod_enable" >> /tmp/world.mt
 	    fi
 	fi
     done