Include the mapserver binary directly

diff --git a/README b/README
index 55ba2880214c4e7f5776c03acb97815c43700f99..92762b23da2e4a1649666f8e13b3f921a1ec008c 100644 (file)
--- a/README
+++ b/README
@@ -21,7 +21,7 @@ Elidragon v2 requires a GNU/Linux x86_64 system to run. The setup and update scr
 1. Create a new user using adduser and switch to it. The user should be able to use sudo.
 2. git clone this repository into that user's home directory and rename it to .minetest
 3. cd into .minetest
-4. run scripts/setup.sh - this will automatically install minetest and screen. Also, it initialized the submodules - all external mods and MineClone2 are installed automatically. It will also install mapserver, multiserver and its dependencies.
+4. run scripts/setup.sh - this will automatically install minetest and screen. Also, it initialized the submodules - all external mods and MineClone2 are installed automatically. It will also install multiserver and its dependencies.
 5. run scripts/start.sh --all - this will automatically start all worlds, multiserver and mapserver. If one world or multiserver / mapserver crashes or shuts down it will automatically restarted.
 
 To update, run scripts/update.sh, to restart all worlds run scripts/restart.sh --worlds and to stop all worlds and multiserver run scripts/stop.sh --all.

diff --git a/scripts/setup.sh b/scripts/setup.sh
index 67f2448944f18582db8482ecd84a24f0ebda2db5..be0ca80778abbfb1d06a25ae91dd88a000fc6ef4 100755 (executable)
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -15,8 +15,8 @@ sudo apt install minetest screen -y
 # Install multiserver and its dependencies
 go get github.com/HimbeerserverDE/multiserver
 
-# Download & install mapserver
-cd worlds/creative/
-curl -s https://api.github.com/repos/minetest-mapserver/mapserver/releases/latest | grep "mapserver-linux-x86_64" | cut -d : -f 2,3 | tr -d \" | wget -qi -
-chmod +x mapserver-linux-x86_64
-cd ../..
+# Download & install mapserver (disabled for now)
+# cd worlds/creative/
+# curl -s https://api.github.com/repos/minetest-mapserver/mapserver/releases/latest | grep "mapserver-linux-x86_64" | cut -d : -f 2,3 | tr -d \" | wget -qi -
+# chmod +x mapserver-linux-x86_64
+# cd ../..

diff --git a/worlds/creative/.gitignore b/worlds/creative/.gitignore
index 22f42cdecdbd7e53c500be691f3ae1b2715349b8..98f22a9963fa3bd3ad15b3c44c875377d226350e 100644 (file)
--- a/worlds/creative/.gitignore
+++ b/worlds/creative/.gitignore
@@ -2,3 +2,4 @@
 !world.mt
 !minetest.conf
 !.gitignore
+!mapserver-linux-x86_64

diff --git a/worlds/creative/mapserver-linux-x86_64 b/worlds/creative/mapserver-linux-x86_64
new file mode 100644 (file)
index 0000000..2fdc723
Binary files /dev/null and b/worlds/creative/mapserver-linux-x86_64 differ