]> git.lizzy.rs Git - rust.git/commitdiff
Make the pre-push script work on directories with spaces
authorJoshua Nelson <github@jyn.dev>
Sat, 17 Dec 2022 23:18:13 +0000 (17:18 -0600)
committerJoshua Nelson <github@jyn.dev>
Sat, 17 Dec 2022 23:18:53 +0000 (17:18 -0600)
As a secondary benefit, it's also a lot simpler.

src/etc/pre-push.sh

index be7de3ebaf5712979fc6976b8a2edd4b1693d8e4..2a3086338b4bfe0591961272c2ac9582213ae574 100755 (executable)
@@ -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