Should hopefully work..

tools/hooks/install.sh

@@ -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"

tools/travis/build_tgui.sh

@@ -1,7 +1,25 @@
 #!/bin/bash
 set -euo pipefail
 
-cd tgui
-source ~/.nvm/nvm.sh
+## Change to project root relative to the script
+cd "$(dirname "${0}")/../.."
+base_dir="$(pwd)"
+
+## The final authority on what's required to fully build the project
+source dependencies.sh
+
+## Setup NVM
+if [[ -e ~/.nvm/nvm.sh ]]; then
+	source ~/.nvm/nvm.sh
+	nvm use "${NODE_VERSION}"
+fi
+
+echo "Building 'tgui'"
+cd "${base_dir}/tgui"
 npm ci
 node node_modules/gulp/bin/gulp.js --min
+
+echo "Building 'tgui-next'"
+cd "${base_dir}/tgui-next"
+bin/tgui --clean
+bin/tgui

tools/travis/install_build_tools.sh

@@ -5,6 +5,8 @@ source dependencies.sh
 
 source ~/.nvm/nvm.sh
 nvm install $NODE_VERSION
+nvm use $NODE_VERSION
+npm install --global yarn
 
 pip3 install --user PyYaml
 pip3 install --user beautifulsoup4