BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Util: Use quotation marks for safe path handling

Browse Source
This commit is contained in:
SmallJoker 2022-07-22 19:47:21 +02:00
parent 8dcbca1068
commit 2351c95612
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/stress_mapgen.sh
View File

@ -14,17 +14,17 @@ run () {
fi fi
} }
[ -e $minetest ] || { echo "executable $minetest missing"; exit 1; } [ -e "$minetest" ] || { echo "executable $minetest missing"; exit 1; }
rm -rf $worldpath rm -rf "$worldpath"
mkdir -p $worldpath/worldmods mkdir -p "$worldpath/worldmods"
settings=(sqlite_synchronous=0 helper_mode=mapgen) settings=(sqlite_synchronous=0 helper_mode=mapgen)
[ -n "$PROFILER" ] && settings+=(profiler_print_interval=15) [ -n "$PROFILER" ] && settings+=(profiler_print_interval=15)
printf '%s\n' "${settings[@]}" >$testspath/server.conf \ printf '%s\n' "${settings[@]}" >"$testspath/server.conf" \
ln -s $dir/helper_mod $worldpath/worldmods/ ln -s "$dir/helper_mod" "$worldpath/worldmods/"
args=(--config $conf_server --world $worldpath --gameid $gameid) args=(--config "$conf_server" --world "$worldpath" --gameid $gameid)
[ -n "$PROFILER" ] && args+=(--verbose) [ -n "$PROFILER" ] && args+=(--verbose)
run $minetest --server "${args[@]}" run "$minetest" --server "${args[@]}"

22
util/test_multiplayer.sh
View File

@ -23,33 +23,33 @@ gdbrun () {
gdb -q -batch -ex 'set confirm off' -ex 'r' -ex 'bt' --args "$@" gdb -q -batch -ex 'set confirm off' -ex 'r' -ex 'bt' --args "$@"
} }
[ -e $minetest ] || { echo "executable $minetest missing"; exit 1; } [ -e "$minetest" ] || { echo "executable $minetest missing"; exit 1; }
rm -rf $worldpath rm -rf "$worldpath"
mkdir -p $worldpath/worldmods mkdir -p "$worldpath/worldmods"
printf '%s\n' >$testspath/client1.conf \ printf '%s\n' >"$testspath/client1.conf" \
video_driver=null name=client1 viewing_range=10 \ video_driver=null name=client1 viewing_range=10 \
enable_{sound,minimap,shaders}=false enable_{sound,minimap,shaders}=false
printf '%s\n' >$testspath/server.conf \ printf '%s\n' >"$testspath/server.conf" \
max_block_send_distance=1 devtest_unittests_autostart=true \ max_block_send_distance=1 devtest_unittests_autostart=true \
helper_mode=devtest helper_mode=devtest
ln -s $dir/helper_mod $worldpath/worldmods/ ln -s "$dir/helper_mod" "$worldpath/worldmods/"
echo "Starting server" echo "Starting server"
gdbrun $minetest --server --config $conf_server --world $worldpath --gameid $gameid 2>&1 | sed -u 's/^/(server) /' & gdbrun "$minetest" --server --config "$conf_server" --world "$worldpath" --gameid $gameid 2>&1 | sed -u 's/^/(server) /' &
waitfor $worldpath/startup waitfor "$worldpath/startup"
echo "Starting client" echo "Starting client"
gdbrun $minetest --config $conf_client1 --go --address 127.0.0.1 2>&1 | sed -u 's/^/(client) /' & gdbrun "$minetest" --config "$conf_client1" --go --address 127.0.0.1 2>&1 | sed -u 's/^/(client) /' &
waitfor $worldpath/done waitfor "$worldpath/done"
echo "Waiting for client and server to exit" echo "Waiting for client and server to exit"
wait wait
if [ -f $worldpath/test_failure ]; then if [ -f "$worldpath/test_failure" ]; then
echo "There were test failures." echo "There were test failures."
exit 1 exit 1
fi fi