From f23f0ee99876fa4c28c52b2fded57b46f4a3e099 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 19 Jun 2021 17:49:10 +0200 Subject: [PATCH] run in place false. make install --- minetest-server.sh | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/minetest-server.sh b/minetest-server.sh index 33815ae..77f1f05 100644 --- a/minetest-server.sh +++ b/minetest-server.sh @@ -5,9 +5,7 @@ minetestUrlReleases="https://github.com/minetest/minetest/archive/refs/tags" minetestVersion="5.4.1" minetestUrlSourceCode="$minetestUrlReleases/$minetestVersion.tar.gz" minetestDirTmp="/tmp/minetest-$minetestVersion.tar.gz" -minetestDirBin="/usr/bin" minetestDirConfig="/etc/minetest" -minetestDirResources="/usr/share/minetest" main (){ updateSys @@ -15,10 +13,7 @@ main (){ downloadMinetest extractMinetest compileMinetest - copyBinMinetestServer copyConfMinetestServer - createDirResources - copyDefaultWorld } isOK (){ @@ -64,14 +59,9 @@ compileMinetest (){ echo "Compiling in 2";sleep 1 echo "Compiling in 1";sleep 1 sleep 3 - cmake . -DRUN_IN_PLACE=TRUE -DBUILD_SERVER=TRUE -DBUILD_CLIENT=FALSE -DENABLE_REDIS=OFF -DENABLE_LEVELDB=OFF -DCMAKE_BUILD_TYPE=Release -DENABLE_CURL=ON -DENABLE_CURSES=ON -DENABLE_FREETYPE=ON -DENABLE_GETTEXT=ON -DENABLE_POSTGRESQL=ON -DENABLE_SPATIAL=ON -DENABLE_SOUND=ON -DENABLE_LUAJIT=ON -DENABLE_PROMETHEUS=OFF -DENABLE_SYSTEM_GMP=ON -DPostgreSQL_LIBRARY=/usr/lib/x86_64-linux-gnu/libpq.so.5 + cmake . -DRUN_IN_PLACE=FALSE -DBUILD_SERVER=TRUE -DBUILD_CLIENT=FALSE -DENABLE_REDIS=OFF -DENABLE_LEVELDB=OFF -DCMAKE_BUILD_TYPE=Release -DENABLE_CURL=ON -DENABLE_CURSES=ON -DENABLE_FREETYPE=ON -DENABLE_GETTEXT=ON -DENABLE_POSTGRESQL=ON -DENABLE_SPATIAL=ON -DENABLE_SOUND=ON -DENABLE_LUAJIT=ON -DENABLE_PROMETHEUS=OFF -DENABLE_SYSTEM_GMP=ON -DPostgreSQL_LIBRARY=/usr/lib/x86_64-linux-gnu/libpq.so.5 make -j$(nproc) - isOK -} - -copyBinMinetestServer (){ - taskName="Copy binary file: minetestserver to $minetestDirBin/"; echo -e "\n[+][$taskName]" - cp -pR /tmp/minetest-$minetestVersion/bin/minetestserver $minetestDirBin/ + make install isOK } @@ -82,19 +72,5 @@ copyConfMinetestServer (){ isOK } -createDirResources (){ - taskName="make resource directories on $minetestDirResources"; echo -e "\n[+][$taskName]" - mkdir -p $minetestDirResources $minetestDirResources/worlds - isOK -} - -copyDefaultWorld (){ - taskName="Download minetest_game"; echo -e "\n[+][$taskName]" - cd $minetestDirResources/worlds - rm -rf $minetestDirResources/worlds/minetest_game - git clone https://github.com/minetest/minetest_game.git minetest_game - isOK -} - main