From d0dff5b738bacc146ab2df784cccb255094b4a28 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Thu, 1 Oct 2020 12:27:05 +0300
Subject: [PATCH] fixes

---
 docker/packager/binary/build.sh           | 3 ++-
 docker/test/stateful/run.sh               | 3 ++-
 docker/test/stateful_with_coverage/run.sh | 3 ++-
 docker/test/stress/run.sh                 | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh
index 300b70c4720..5df0392cb4d 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@@ -18,7 +18,8 @@ ccache --zero-stats ||:
 ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so ||:
 rm -f CMakeCache.txt
 cmake --debug-trycompile --verbose=1 -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "$CMAKE_FLAGS" ..
-ninja "$NINJA_FLAGS" clickhouse-bundle
+# shellcheck disable=SC2086 # No quotes because I want it to expand to nothing if empty.
+ninja $NINJA_FLAGS clickhouse-bundle
 mv ./programs/clickhouse* /output
 mv ./src/unit_tests_dbms /output ||: # may not exist for some binary builds
 find . -name '*.so' -print -exec mv '{}' /output \;
diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index fa1d627bf57..98c9427d556 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -31,7 +31,8 @@ function start()
 }
 
 start
-/s3downloader --dataset-names "$DATASETS"
+# shellcheck disable=SC2086 # No quotes because I want to split it into words.
+/s3downloader --dataset-names $DATASETS
 chmod 777 -R /var/lib/clickhouse
 clickhouse-client --query "SHOW DATABASES"
 clickhouse-client --query "ATTACH DATABASE datasets ENGINE = Ordinary"
diff --git a/docker/test/stateful_with_coverage/run.sh b/docker/test/stateful_with_coverage/run.sh
index dc730f461bb..b20e21efaf1 100755
--- a/docker/test/stateful_with_coverage/run.sh
+++ b/docker/test/stateful_with_coverage/run.sh
@@ -72,7 +72,8 @@ function start()
 
 start
 
-if ! /s3downloader --dataset-names "$DATASETS"; then
+# shellcheck disable=SC2086 # No quotes because I want to split it into words.
+if ! /s3downloader --dataset-names $DATASETS; then
     echo "Cannot download datatsets"
     exit 1
 fi
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index bea246eb536..ba529c401ea 100755
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -49,7 +49,8 @@ export ASAN_OPTIONS='malloc_context_size=10 verbosity=1 allocator_release_to_os_
 
 start
 
-/s3downloader --dataset-names "$DATASETS"
+# shellcheck disable=SC2086 # No quotes because I want to split it into words.
+/s3downloader --dataset-names $DATASETS
 chmod 777 -R /var/lib/clickhouse
 clickhouse-client --query "ATTACH DATABASE IF NOT EXISTS datasets ENGINE = Ordinary"
 clickhouse-client --query "CREATE DATABASE IF NOT EXISTS test"