Simplify cargo-target-dir extraction

This commit is contained in:
David Peter 2021-11-22 20:49:10 +01:00 committed by David Peter
parent 1822c981da
commit ea2faf45e4

View file

@ -8,18 +8,18 @@ if ! command -v hyperfine > /dev/null 2>&1; then
exit 1 exit 1
fi fi
# Determine the target directories. # Check that jq is installed.
get_target_dir() { if ! command -v jq > /dev/null 2>&1; then
if [[ -f "$HOME/.cargo/config" ]]; then echo "'jq' does not seem to be installed."
grep 'target-dir[[:space:]]*=' "$HOME/.cargo/config" \ echo "You can get it here: https://stedolan.github.io/jq"
| sed 's/^[[:space:]]*target-dir[[:space:]]*=//; s/^[[:space:]]*"//; s/"[[:space:]]*$//' \ exit 1
&& return 0 fi
fi
echo "../../target" get_cargo_target_dir() {
cargo metadata --no-deps --format-version 1 | jq -r .target_directory
} }
TARGET_DIR="$(get_target_dir)" TARGET_DIR="$(get_cargo_target_dir)"
TARGET_DEBUG="${TARGET_DIR}/debug/bat" TARGET_DEBUG="${TARGET_DIR}/debug/bat"
TARGET_RELEASE="${TARGET_DIR}/release/bat" TARGET_RELEASE="${TARGET_DIR}/release/bat"