mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-15 04:31:49 +00:00
1d335dd9e9
Adds TG's mapmerge2, a new TGM-compatible merger that handles things like dictionary expansion much better than the old tool, as well as supporting a git merge hook for map files. This PR does not remove the old merger as this one is more annoying to setup.
18 lines
363 B
Bash
18 lines
363 B
Bash
#!/bin/bash
|
|
set -e
|
|
if command -v python3 >/dev/null 2>&1; then
|
|
PY=python3
|
|
else
|
|
PY=python
|
|
fi
|
|
PATHSEP=$($PY - <<'EOF'
|
|
import sys, os
|
|
if sys.version_info.major != 3 or sys.version_info.minor < 6:
|
|
sys.stderr.write("Python 3.6+ is required: " + sys.version + "\n")
|
|
exit(1)
|
|
print(os.pathsep)
|
|
EOF
|
|
)
|
|
export PYTHONPATH=tools/mapmerge2/${PATHSEP}${PYTHONPATH}
|
|
$PY "$@"
|