mirror/libsignal
0
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2024-09-20 12:02:18 +02:00
Code

Merge pull request #245 from signalapp/jrose/shellcheck-command-v

Browse Source 
Use `command -v` instead of `which`, as recommended by Shellcheck
This commit is contained in:
Jordan Rose 2021-03-12 09:43:32 -08:00 committed by GitHub
commit 08d6495635
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/build_helpers.sh
View File

@ -6,21 +6,21 @@
# shellcheck shell=bash
check_rust() {
if ! which rustup > /dev/null && [[ -d ~/.cargo/bin ]]; then
if ! command -v rustup > /dev/null && [[ -d ~/.cargo/bin ]]; then
# Try to find rustup in its default per-user install location.
# This will be important when running from inside Xcode,
# which does not run in a login shell context.
PATH=~/.cargo/bin:$PATH
fi
if ! which rustup > /dev/null; then
if ! which cargo > /dev/null; then
if ! command -v rustup > /dev/null; then
if ! command -v cargo > /dev/null; then
echo 'error: cargo not found in PATH; do you have Rust installed?' >&2
echo 'note: we recommend installing Rust via rustup from https://rustup.rs/' >&2
exit 1
fi
echo 'warning: rustup not found in PATH; using cargo at' "$(which cargo)" >&2
echo 'warning: rustup not found in PATH; using cargo at' "$(command -v cargo)" >&2
echo 'note: this project uses Rust toolchain' "'$(cat ./rust-toolchain)'" >&2
return
fi

4
swift/build_ffi.sh
View File

@ -29,9 +29,9 @@ END
}
check_cbindgen() {
if ! which cbindgen > /dev/null; then
if ! command -v cbindgen > /dev/null; then
echo 'error: cbindgen not found in PATH' >&2
if which cargo > /dev/null; then
if command -v cargo > /dev/null; then
echo 'note: get it by running' >&2
printf "\n\t%s\n\n" "cargo install cbindgen --vers '^0.16'" >&2
fi