mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Update precommit hooks to work in GitHub Desktop (Port) (#8773)
* Update precommit hooks to work in GitHub Desktop * Add helpful comment * dmi.merge too just in case this helps somehow, not tested though * Update tools/hooks/python.sh Co-authored-by: Ling <lingbleed@gmail.com> Co-authored-by: Tad Hardesty <tad@platymuus.com> Co-authored-by: Ling <lingbleed@gmail.com>
This commit is contained in:
@@ -1,2 +1,2 @@
|
|||||||
#!/bin/bash
|
#!/bin/sh
|
||||||
exec tools/hooks/python.sh -m merge_driver_dmi "$@"
|
exec tools/hooks/python.sh -m merge_driver_dmi "$@"
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/bin/sh
|
||||||
|
# `sh` must be used here instead of `bash` to support GitHub Desktop.
|
||||||
exec tools/hooks/python.sh -m precommit
|
exec tools/hooks/python.sh -m precommit
|
||||||
|
|||||||
@@ -1,17 +1,22 @@
|
|||||||
#!/bin/bash
|
#!/bin/sh
|
||||||
|
# `sh` must be used here instead of `bash` to support GitHub Desktop.
|
||||||
set -e
|
set -e
|
||||||
if command -v python3 >/dev/null 2>&1; then
|
if command -v python3 >/dev/null 2>&1; then
|
||||||
PY=python3
|
PY=python3
|
||||||
else
|
elif command -v python >/dev/null 2>&1; then
|
||||||
PY=python
|
PY=python
|
||||||
|
elif command -v py >/dev/null 2>&1; then
|
||||||
|
PY=py
|
||||||
|
else
|
||||||
|
echo "Please install Python 3.6 or later."
|
||||||
fi
|
fi
|
||||||
PATHSEP=$($PY - <<'EOF'
|
PATHSEP=$($PY - <<'EOF'
|
||||||
import sys, os
|
import sys, os
|
||||||
if sys.version_info.major != 3 or sys.version_info.minor < 6:
|
if sys.version_info.major != 3 or sys.version_info.minor < 6:
|
||||||
sys.stderr.write("Python 3.6+ is required: " + sys.version + "\n")
|
sys.stderr.write("Python 3.6 or later is required, but you have: " + sys.version + "\n")
|
||||||
exit(1)
|
exit(1)
|
||||||
print(os.pathsep)
|
print(os.pathsep)
|
||||||
EOF
|
EOF
|
||||||
)
|
)
|
||||||
export PYTHONPATH=tools/mapmerge2/${PATHSEP}${PYTHONPATH}
|
export PYTHONPATH=tools/mapmerge2/${PATHSEP}${PYTHONPATH}
|
||||||
$PY "$@"
|
exec $PY "$@"
|
||||||
|
|||||||
Reference in New Issue
Block a user