From 3079080acf76a0e15d9b9bfb9e5e0af28f61dc77 Mon Sep 17 00:00:00 2001
From: Azareal <azareal@users.noreply.github.com>
Date: Thu, 22 Nov 2018 18:50:53 +1000
Subject: [PATCH] Refactor these shell scripts. Bumped up the version of
 MariaDB for Travis.

---
 .travis.yml       |  2 +-
 build-linux       | 15 +++------------
 dev-update-linux  |  5 +----
 dev-update-travis |  5 +----
 install-linux     |  6 +-----
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 411b85e4..d1598d48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,4 @@ script: ./run-linux-tests
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 addons:
-  mariadb: '10.1'
\ No newline at end of file
+  mariadb: '11.0'
\ No newline at end of file
diff --git a/build-linux b/build-linux
index 0a0f3d85..974ea96d 100644
--- a/build-linux
+++ b/build-linux
@@ -5,18 +5,12 @@ rm -f tmpl_client/template_*.go
 rm -f ./Gosora
 
 echo "Building the router generator"
-cd ./router_gen
-go build -o RouterGen
-mv ./RouterGen ..
-cd ..
+go build -o RouterGen "./router_gen"
 echo "Running the router generator"
 ./RouterGen
 
 echo "Building the query generator"
-cd ./cmd/query_gen
-go build -o QueryGen
-mv ./QueryGen ../..
-cd ../..
+go build -o QueryGen "./cmd/query_gen"
 echo "Running the query generator"
 ./QueryGen
 
@@ -25,7 +19,4 @@ go generate
 go build -o Gosora
 
 echo "Building the installer"
-cd ./install
-go build -o Installer
-mv ./Installer ..
-cd ..
+go build -o Installer "./install"
diff --git a/dev-update-linux b/dev-update-linux
index 4a9293f0..9ec9939a 100644
--- a/dev-update-linux
+++ b/dev-update-linux
@@ -9,9 +9,6 @@ git pull origin master
 git stash apply
 
 echo "Patching Gosora"
-cd ./patcher
 go generate
-go build -o Patcher
-mv ./Patcher ..
-cd ..
+go build -o Patcher "./patcher"
 ./Patcher
\ No newline at end of file
diff --git a/dev-update-travis b/dev-update-travis
index a271c651..90818d5f 100644
--- a/dev-update-travis
+++ b/dev-update-travis
@@ -1,7 +1,4 @@
 echo "Building the patcher"
 cp ./schema/schema.json ./schema/lastSchema.json
-cd ./patcher
 go generate
-go build -o Patcher
-mv ./Patcher ..
-cd ..
\ No newline at end of file
+go build -o Patcher "./patcher"
\ No newline at end of file
diff --git a/install-linux b/install-linux
index 200eda20..de3e6b6a 100644
--- a/install-linux
+++ b/install-linux
@@ -2,11 +2,7 @@ echo "Installing the dependencies"
 go get
 
 echo "Building the installer"
-cd ./install
-go generate
-go build -o Installer
-mv ./Installer ..
-cd ..
+go build -o Installer "./install"
 
 echo "Running the installer"
 ./Installer