diff --git a/install.sh b/install.sh index e6c96ef..0ae35fe 100755 --- a/install.sh +++ b/install.sh @@ -235,12 +235,6 @@ install_world() { createdb players-$pg_dbname fi - if [[ $ver == "1.1" || $ver == "stable" || $ver == "dev" ]]; then - echo "auth_backend = sqlite3" >> world.mt - fi - - ln -s $(pwd)/world.mt minetest/worlds/$world_name/world.mt - ./upgrade.sh -w $world_name -b $ver mkdir -p minetest/worlds/$world_name/runes diff --git a/upgrade.sh b/upgrade.sh index 1097375..5f33abd 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -114,7 +114,7 @@ regen_worldmt() { if [[ -d $mods_path/$mod ]]; then ln -s $mods_path/$mod $mods_minetest/$mod - if [[ -e $mods_path/$mod/modpack.txt ]]; then + if [[ -e $mods_path/$mod/modpack.txt || -e $mods_path/$mod/modpack.conf ]]; then ls $mods_path/$mod | while read -r submod; do if [[ -d $mods_path/$mod/$submod ]]; then local mod_enable="true" @@ -201,7 +201,9 @@ update_world() { file=$world_repos/random_messages-$BRANCH;; worldmt) do_copy=0 - regen_worldmt;; + regen_worldmt + rm -f $world_dest/world.mt + ln -s $serverpath/world.mt $world_dest/world.mt;; mtconf) # Exception ici car n'est pas un fichier world. Doit ĂȘtre appelĂ© seul. file_dest=$serverpath/minetest/minetest.conf file=$serverpath/minetest-$BRANCH.conf;;