Rollup merge of rust-lang#95722 - xu-cheng:pre-push, r=Mark-Simulacrum

matthiaskrgr · web-flow · commit a899ebd10241 · 2022-04-12T08:46:56.000+02:00
pre-push.sh: Use python3 if python is not found

Since Python 2 has reached EOL, `python` may not be available in certain systems (e.g., recent macOS). We should use `python3` in this case to avoid error like `python: No such file or directory`.
diff --git a/src/etc/pre-push.sh b/src/etc/pre-push.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Call `tidy --bless` before each commit
+# Call `tidy --bless` before git push
 # Copy this script to .git/hooks to activate,
 # and remove it from .git/hooks to deactivate.
 #
@@ -14,6 +14,8 @@ COMMAND="$ROOT_DIR/x.py test tidy --bless"
 
 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'"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`	`2`	`#`
`3`		-# Call `tidy --bless` before each commit
	`3`	+# Call `tidy --bless` before git push
`4`	`4`	`# Copy this script to .git/hooks to activate,`
`5`	`5`	`# and remove it from .git/hooks to deactivate.`
`6`	`6`	`#`
`@@ -14,6 +14,8 @@ COMMAND="$ROOT_DIR/x.py test tidy --bless"`
`14`	`14`
`15`	`15`	`if [[ "$OSTYPE" == "msys" \|\| "$OSTYPE" == "win32" ]]; then`
`16`	`16`	`COMMAND="python $COMMAND"`
	`17`	`+elif ! command -v python &> /dev/null; then`
	`18`	`+ COMMAND="python3 $COMMAND"`
`17`	`19`	`fi`
`18`	`20`
`19`	`21`	`echo "Running pre-push script '$COMMAND'"`