From 5b6bf471fb4b670924136c62c821482876573c3d Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Mon, 21 Dec 2020 15:11:17 -0500
Subject: [PATCH] Streamline

---
 Dockerfile              | 6 +-----
 Jenkinsfile             | 2 +-
 build/build-minetest.sh | 2 --
 build/build.sh          | 6 ++++++
 run.sh                  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100755 build/build.sh

diff --git a/Dockerfile b/Dockerfile
index 4a0169a..c4c0898 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,4 @@ WORKDIR /app
 ADD build/install-dependencies.sh /app/
 RUN ./install-dependencies.sh
 
-ADD build/build-irrlicht.sh /app/
-RUN ./build-irrlicht.sh
-
-ADD build/build-minetest.sh /app/
-ADD build/DEBIAN /app/DEBIAN
+ADD build/build-irrlicht.sh build/build-minetest.sh build/DEBIAN /app/
diff --git a/Jenkinsfile b/Jenkinsfile
index c3bf783..3d8b81f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
         stage('Build') {
             steps {
                 // Build
-                sh 'cd /app; ./build-minetest.sh'
+                sh 'cd /app; ./build.sh'
                 // Copy Artifacts
                 sh 'mkdir out; cp /out/*.deb out'
             }
diff --git a/build/build-minetest.sh b/build/build-minetest.sh
index 52ca1b2..dd4f35b 100755
--- a/build/build-minetest.sh
+++ b/build/build-minetest.sh
@@ -2,8 +2,6 @@
 
 set -e
 
-cd /app
-
 git clone https://github.com/TheBrokenRail/minetest.git -b desktop-touch
 cd minetest
 
diff --git a/build/build.sh b/build/build.sh
new file mode 100755
index 0000000..827a414
--- /dev/null
+++ b/build/build.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+./build-irrlicht.sh
+./build-minetest.sh
diff --git a/run.sh b/run.sh
index 0826744..e0b99f7 100755
--- a/run.sh
+++ b/run.sh
@@ -2,10 +2,10 @@
 
 set -e
 
-# Build Dependencies
+# Build Image
 docker build ${DOCKER_BUILD_OPTIONS} --tag minetest-dev .
 
 # Extract
 rm -rf out
 mkdir out
-docker run --rm -v "$(pwd)/out:/out" minetest-dev ./build-minetest.sh
+docker run --rm -v "$(pwd)/out:/out" minetest-dev ./build.sh