port "PR to make travis use xenial and to make it work"

tools/travis/build_dependencies.sh

@@ -4,6 +4,17 @@ set -e
 
 source dependencies.sh
 
+#ensure the Dockerfile version matches the dependencies.sh version
+line=$(head -n 1 Dockerfile)
+if [[ $line != *"$BYOND_MAJOR.$BYOND_MINOR"* ]]; then
+  echo "Dockerfile BYOND version in FROM command does not match dependencies.sh (Or it's not on line 1)!"
+  exit 1
+#!/usr/bin/env bash
+
+set -e
+
+source dependencies.sh
+
 #ensure the Dockerfile version matches the dependencies.sh version
 line=$(head -n 1 Dockerfile)
 if [[ $line != *"$BYOND_MAJOR.$BYOND_MINOR"* ]]; then
@@ -41,19 +52,10 @@ if [ $BUILD_TOOLS = false ] && [ $BUILD_TESTING = false ]; then
         echo "Setting up MariaDB."
         rm -rf "$HOME/MariaDB"
         mkdir -p "$HOME/MariaDB"
-        wget http://mirrors.kernel.org/ubuntu/pool/universe/m/mariadb-client-lgpl/libmariadb2_2.0.0-1_i386.deb
-        dpkg -x libmariadb2_2.0.0-1_i386.deb /tmp/extract
-        rm libmariadb2_2.0.0-1_i386.deb
-        mv /tmp/extract/usr/lib/i386-linux-gnu/libmariadb.so.2 $HOME/MariaDB/
-        ln -s $HOME/MariaDB/libmariadb.so.2 $HOME/MariaDB/libmariadb.so
-        rm -rf /tmp/extract
-
-        wget http://mirrors.kernel.org/ubuntu/pool/universe/m/mariadb-connector-c/libmariadb-dev_2.3.3-1_i386.deb
-        dpkg -x libmariadb-dev_2.3.3-1_i386.deb /tmp/extract
-        rm libmariadb-dev_2.3.3-1_i386.deb
-        mv /tmp/extract/usr/include $HOME/MariaDB/
-        #fuck what is this even?
-        mv $HOME/MariaDB/include/mariadb $HOME/MariaDB/include/mysql
+		mkdir -p "$HOME/MariaDB/include"
+        cp /usr/lib/i386-linux-gnu/libmariadb.so.2 $HOME/MariaDB/
+		ln -s $HOME/MariaDB/libmariadb.so.2 $HOME/MariaDB/libmariadb.so
+        cp -r /usr/include/mariadb $HOME/MariaDB/include/
     fi
 
     cd artifacts

tools/travis/install_build_tools.sh

@@ -4,9 +4,8 @@ set -e
 source dependencies.sh
 
 if [ "$BUILD_TOOLS" = true ]; then
-      rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $NODE_VERSION
-      pip3 install --user PyYaml -q
-      pip3 install --user beautifulsoup4 -q
-fi;
-
-
+      source ~/.nvm/nvm.sh
+      nvm install $NODE_VERSION
+      pip3 install --user PyYaml
+      pip3 install --user beautifulsoup4
+fi;