From 8625029ab81d2f7fb124728a62d0440621ccb30d Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Fri, 30 Oct 2020 15:14:05 +0900
Subject: [PATCH] Fix shellcheck warnings
---
ci/install-rust.sh | 6 +++---
ci/run-docker.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ci/install-rust.sh b/ci/install-rust.sh
index 598dec28..dcd24b88 100644
--- a/ci/install-rust.sh
+++ b/ci/install-rust.sh
@@ -47,13 +47,13 @@ if [ "$OS" = "windows" ]; then
fi
echo "Query rust and cargo versions"
+command -v rustc
+command -v cargo
+command -v rustup
rustc -Vv
cargo -V
rustup -Vv
rustup show
-which rustc
-which cargo
-which rustup
echo "Generate lockfile"
N=5
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index 648eafcd..f1fa6656 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -62,7 +62,7 @@ build_switch() {
kvm=""
fi
- cp "$(which rustup)" "$(rustc --print sysroot)/bin"
+ cp "$(command -v rustup)" "$(rustc --print sysroot)/bin"
docker run \
--rm \
--
GitLab