Util: Use quotation marks for safe path handling

diff --git a/util/stress_mapgen.sh b/util/stress_mapgen.sh
index ba152dd80da970777fa1731482f6ba46afcfa811..6bbe574833126964ea090c8806d284b069814e54 100755 (executable)
--- 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 e0d0ec742b1ffe711fc754e5c9c4a37c35d72da2..1fcf298e873ffd355b9759b690c560e5db842d39 100755 (executable)
--- 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