From ac5b2ffb397d6918b83fbd4cc634e7e99e80a218 Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Wed, 25 Jan 2023 21:03:39 -0700 Subject: [PATCH] make `scripts/cargo-fmt.sh` $PWD agnostic (#29919) --- scripts/cargo-fmt.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/scripts/cargo-fmt.sh b/scripts/cargo-fmt.sh index f8df585b21..552c662c1f 100755 --- a/scripts/cargo-fmt.sh +++ b/scripts/cargo-fmt.sh @@ -10,11 +10,19 @@ if [[ -z $cargo ]]; then exit 1 fi -set -ex +fmt_dirs=( + . + programs/sbf + sdk/cargo-build-sbf/tests/crates/fail + sdk/cargo-build-sbf/tests/crates/noop + storage-bigtable/build-proto + web3.js/test/fixtures/noop-program +) -"$cargo" nightly fmt --all -(cd programs/sbf && "$cargo" nightly fmt --all) -(cd sdk/cargo-build-sbf/tests/crates/fail && "$cargo" nightly fmt --all) -(cd sdk/cargo-build-sbf/tests/crates/noop && "$cargo" nightly fmt --all) -(cd storage-bigtable/build-proto && "$cargo" nightly fmt --all) -(cd web3.js/test/fixtures/noop-program && "$cargo" nightly fmt --all) +for fmt_dir in "${fmt_dirs[@]}"; do + ( + manifest_path="$(readlink -f "$here"/../"$fmt_dir"/Cargo.toml)" + set -ex + "$cargo" nightly fmt --all --manifest-path "$manifest_path" + ) +done