From c754d057a67bb8779789ad48708632fcf87361b1 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Sat, 17 Dec 2022 17:18:13 -0600 Subject: [PATCH] Make the pre-push script work on directories with spaces As a secondary benefit, it's also a lot simpler. --- src/etc/pre-push.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/etc/pre-push.sh b/src/etc/pre-push.sh index be7de3ebaf5..2a3086338b4 100755 --- a/src/etc/pre-push.sh +++ b/src/etc/pre-push.sh @@ -10,16 +10,8 @@ set -Eeuo pipefail # https://github.com/rust-lang/rust/issues/77620#issuecomment-705144570 unset GIT_DIR ROOT_DIR="$(git rev-parse --show-toplevel)" -COMMAND="$ROOT_DIR/x.py test tidy" -if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then - COMMAND="python $COMMAND" -elif ! command -v python &> /dev/null; then - COMMAND="python3 $COMMAND" -fi - -echo "Running pre-push script '$COMMAND'" +echo "Running pre-push script $ROOT_DIR/x test tidy" cd "$ROOT_DIR" - -$COMMAND +./x test tidy -- 2.44.0