Should hopefully work..

2020-02-07 18:20:09 +01:00
parent 0e778fc2be
commit b615be1248
5 changed files with 142 additions and 6 deletions
@@ -10,6 +10,11 @@ for f in *.merge; do
 	echo Installing merge driver: ${f%.merge}
 	git config --replace-all merge.${f%.merge}.driver "tools/hooks/$f %P %O %A %B %L"
 done
-echo Installing Python dependencies
+
+echo "Installing tgui hooks"
+../../tgui-next/bin/tgui --install-git-hooks
+
+echo "Installing Python dependencies"
 ./python.sh -m pip install -r ../mapmerge2/requirements.txt
+
 echo "Done"