From 21a097f17e62b6020880dc7e380b9efb3d4bce50 Mon Sep 17 00:00:00 2001 From: Daiki Ihara Date: Tue, 3 Nov 2020 22:55:49 +0900 Subject: [PATCH 1/2] fix shellcheck error of SC2148 --- scripts/config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/config.sh b/scripts/config.sh index af181f4f724..6120a550a27 100644 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash set -e unamestr=`uname` From 07aef9059372f1b3bf61d88bf5917e96e487d323 Mon Sep 17 00:00:00 2001 From: Daiki Ihara Date: Mon, 2 Nov 2020 21:17:52 +0900 Subject: [PATCH 2/2] fix shellcheck error of SC2068 --- scripts/cargo.sh | 4 ++-- test.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/cargo.sh b/scripts/cargo.sh index e63daa40f35..947b4a28798 100755 --- a/scripts/cargo.sh +++ b/scripts/cargo.sh @@ -10,7 +10,7 @@ cmd=$1 shift || true if [[ "$cmd" = "jit" ]]; then -cargo +${TOOLCHAIN} rustc $@ -- --jit +cargo +${TOOLCHAIN} rustc "$@" -- --jit else -cargo +${TOOLCHAIN} $cmd $@ +cargo +${TOOLCHAIN} $cmd "$@" fi diff --git a/test.sh b/test.sh index 3cdd4119d79..c6c4956e481 100755 --- a/test.sh +++ b/test.sh @@ -3,13 +3,13 @@ set -e export RUSTFLAGS="-Zrun_dsymutil=no" -./build.sh --without-sysroot $@ +./build.sh --without-sysroot "$@" rm -r target/out || true scripts/tests.sh no_sysroot -./build.sh $@ +./build.sh "$@" scripts/tests.sh base_sysroot scripts/tests.sh extended_sysroot