From: sfan5 <sfan5@live.de>
Date: Mon, 20 Sep 2021 23:34:10 +0000 (+0200)
Subject: Rename util folder
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=670e421f579a390bf4a357f053fe55d8426b5e2e;p=worldedit.git

Rename util folder

because mod loading woes, minetest/minetest#11240
---

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 597276f..7c679af 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,4 +8,4 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Run tests
-      run: MINETEST_VER=latest ./util/run_tests.sh
+      run: MINETEST_VER=latest ./.util/run_tests.sh
diff --git a/.util/run_tests.sh b/.util/run_tests.sh
new file mode 100755
index 0000000..5cbc15e
--- /dev/null
+++ b/.util/run_tests.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+tempdir=/tmp/mt
+confpath=$tempdir/minetest.conf
+worldpath=$tempdir/world
+
+use_docker=y
+[ -x ../../bin/minetestserver ] && use_docker=
+
+rm -rf $tempdir
+mkdir -p $worldpath
+# the docker image doesn't have devtest
+[ -n "$use_docker" ] || printf '%s\n' gameid=devtest >$worldpath/world.mt
+printf '%s\n' mg_name=singlenode '[end_of_params]' >$worldpath/map_meta.txt
+printf '%s\n' worldedit_run_tests=true max_forceloaded_blocks=9999 >$confpath
+
+if [ -n "$use_docker" ]; then
+	chmod -R 777 $tempdir
+	docker run --rm -i \
+		-v $confpath:/etc/minetest/minetest.conf \
+		-v $tempdir:/var/lib/minetest/.minetest \
+		-v "$PWD/worldedit":/var/lib/minetest/.minetest/world/worldmods/worldedit \
+		registry.gitlab.com/minetest/minetest/server:${MINETEST_VER}
+else
+	mkdir $worldpath/worldmods
+	ln -s "$PWD/worldedit" $worldpath/worldmods/worldedit
+	../../bin/minetestserver --config $confpath --world $worldpath --logfile /dev/null
+fi
+
+test -f $worldpath/tests_ok || exit 1
+exit 0
diff --git a/util/run_tests.sh b/util/run_tests.sh
deleted file mode 100755
index 5cbc15e..0000000
--- a/util/run_tests.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-tempdir=/tmp/mt
-confpath=$tempdir/minetest.conf
-worldpath=$tempdir/world
-
-use_docker=y
-[ -x ../../bin/minetestserver ] && use_docker=
-
-rm -rf $tempdir
-mkdir -p $worldpath
-# the docker image doesn't have devtest
-[ -n "$use_docker" ] || printf '%s\n' gameid=devtest >$worldpath/world.mt
-printf '%s\n' mg_name=singlenode '[end_of_params]' >$worldpath/map_meta.txt
-printf '%s\n' worldedit_run_tests=true max_forceloaded_blocks=9999 >$confpath
-
-if [ -n "$use_docker" ]; then
-	chmod -R 777 $tempdir
-	docker run --rm -i \
-		-v $confpath:/etc/minetest/minetest.conf \
-		-v $tempdir:/var/lib/minetest/.minetest \
-		-v "$PWD/worldedit":/var/lib/minetest/.minetest/world/worldmods/worldedit \
-		registry.gitlab.com/minetest/minetest/server:${MINETEST_VER}
-else
-	mkdir $worldpath/worldmods
-	ln -s "$PWD/worldedit" $worldpath/worldmods/worldedit
-	../../bin/minetestserver --config $confpath --world $worldpath --logfile /dev/null
-fi
-
-test -f $worldpath/tests_ok || exit 1
-exit 0