diff options
| author | SmallJoker <mk939@ymail.com> | 2022-07-22 19:47:21 +0200 |
|---|---|---|
| committer | SmallJoker <mk939@ymail.com> | 2022-07-22 20:13:10 +0200 |
| commit | 2351c9561265d4136f78ce3dd73c0c77acfed711 (patch) | |
| tree | 966490c44538589d0b307762d60fe6b9360beac8 | |
| parent | 8dcbca1068225b6896c3630b390c64d5946d2c73 (diff) | |
| download | minetest-2351c9561265d4136f78ce3dd73c0c77acfed711.tar.gz minetest-2351c9561265d4136f78ce3dd73c0c77acfed711.tar.bz2 minetest-2351c9561265d4136f78ce3dd73c0c77acfed711.zip | |
Util: Use quotation marks for safe path handling
| -rwxr-xr-x | util/stress_mapgen.sh | 14 | ||||
| -rwxr-xr-x | util/test_multiplayer.sh | 22 |
2 files changed, 18 insertions, 18 deletions
diff --git a/util/stress_mapgen.sh b/util/stress_mapgen.sh index ba152dd80..6bbe57483 100755 --- a/util/stress_mapgen.sh +++ b/util/stress_mapgen.sh @@ -14,17 +14,17 @@ run () { fi } -[ -e $minetest ] || { echo "executable $minetest missing"; exit 1; } +[ -e "$minetest" ] || { echo "executable $minetest missing"; exit 1; } -rm -rf $worldpath -mkdir -p $worldpath/worldmods +rm -rf "$worldpath" +mkdir -p "$worldpath/worldmods" settings=(sqlite_synchronous=0 helper_mode=mapgen) [ -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) -run $minetest --server "${args[@]}" +run "$minetest" --server "${args[@]}" diff --git a/util/test_multiplayer.sh b/util/test_multiplayer.sh index e0d0ec742..1fcf298e8 100755 --- a/util/test_multiplayer.sh +++ b/util/test_multiplayer.sh @@ -23,33 +23,33 @@ gdbrun () { 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 -mkdir -p $worldpath/worldmods +rm -rf "$worldpath" +mkdir -p "$worldpath/worldmods" -printf '%s\n' >$testspath/client1.conf \ +printf '%s\n' >"$testspath/client1.conf" \ video_driver=null name=client1 viewing_range=10 \ 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 \ helper_mode=devtest -ln -s $dir/helper_mod $worldpath/worldmods/ +ln -s "$dir/helper_mod" "$worldpath/worldmods/" echo "Starting server" -gdbrun $minetest --server --config $conf_server --world $worldpath --gameid $gameid 2>&1 | sed -u 's/^/(server) /' & -waitfor $worldpath/startup +gdbrun "$minetest" --server --config "$conf_server" --world "$worldpath" --gameid $gameid 2>&1 | sed -u 's/^/(server) /' & +waitfor "$worldpath/startup" echo "Starting client" -gdbrun $minetest --config $conf_client1 --go --address 127.0.0.1 2>&1 | sed -u 's/^/(client) /' & -waitfor $worldpath/done +gdbrun "$minetest" --config "$conf_client1" --go --address 127.0.0.1 2>&1 | sed -u 's/^/(client) /' & +waitfor "$worldpath/done" echo "Waiting for client and server to exit" wait -if [ -f $worldpath/test_failure ]; then +if [ -f "$worldpath/test_failure" ]; then echo "There were test failures." exit 1 fi |