mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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`.
This commit is contained in:
Matthias Krüger 2022-04-12 08:46:56 +02:00 committed by GitHub
commit a899ebd102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/pre-push.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Call `tidy --bless` before each commit # Call `tidy --bless` before git push
# Copy this script to .git/hooks to activate, # Copy this script to .git/hooks to activate,
# and remove it from .git/hooks to deactivate. # 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 if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then
COMMAND="python $COMMAND" COMMAND="python $COMMAND"
elif ! command -v python &> /dev/null; then
COMMAND="python3 $COMMAND"
fi fi
echo "Running pre-push script '$COMMAND'" echo "Running pre-push script '$COMMAND'"