From 76e3b95e41ea08879cd031a46fe25bc1e0ec4de6 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Sun, 30 Jan 2022 10:26:06 +0530 Subject: [PATCH] Fix more instances of `which` How did I miss this before? --- disabled-packages/rustc-nightly/build.sh | 4 ++-- scripts/build/termux_step_setup_toolchain.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/disabled-packages/rustc-nightly/build.sh b/disabled-packages/rustc-nightly/build.sh index 4774183b5..967db837d 100644 --- a/disabled-packages/rustc-nightly/build.sh +++ b/disabled-packages/rustc-nightly/build.sh @@ -26,8 +26,8 @@ termux_step_configure () { -e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" \ -e "s|@TERMUX_HOST_PLATFORM@|$TERMUX_HOST_PLATFORM|g" \ -e "s|@RUST_TARGET_TRIPLE@|$CARGO_TARGET_NAME|g" \ - -e "s|@CARGO@|$(which cargo)|g" \ - -e "s|@RUSTC@|$(which rustc)|g" > $TERMUX_PKG_BUILDDIR/config.toml + -e "s|@CARGO@|$(command -v cargo)|g" \ + -e "s|@RUSTC@|$(command -v rustc)|g" > $TERMUX_PKG_BUILDDIR/config.toml export X86_64_UNKNOWN_LINUX_GNU_OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu export X86_64_UNKNOWN_LINUX_GNU_OPENSSL_INCLUDE_DIR=/usr/include diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index e5038922c..464ca323d 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -163,7 +163,7 @@ termux_setup_standalone_toolchain() { # Create a pkg-config wrapper. We use path to host pkg-config to # avoid picking up a cross-compiled pkg-config later on. local _HOST_PKGCONFIG - _HOST_PKGCONFIG=$(which pkg-config) + _HOST_PKGCONFIG=$(command -v pkg-config) mkdir -p "$PKG_CONFIG_LIBDIR" cat > $_TERMUX_TOOLCHAIN_TMPDIR/bin/pkg-config <<-HERE #!/bin/sh