From bf56307d335dfb0245b8e1b61586370957968e00 Mon Sep 17 00:00:00 2001
From: Nick Leeman <nick@aterve.nl>
Date: Sat, 9 Sep 2023 16:36:14 +0200
Subject: [PATCH] Better build script

---
 java-defold-bob/Dockerfile | 23 +++---------------
 java-defold-bob/setup.sh   | 48 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 20 deletions(-)
 create mode 100644 java-defold-bob/setup.sh

diff --git a/java-defold-bob/Dockerfile b/java-defold-bob/Dockerfile
index ac3d13e..d5cd332 100644
--- a/java-defold-bob/Dockerfile
+++ b/java-defold-bob/Dockerfile
@@ -5,24 +5,7 @@ ENV TIME_ZONE=Amsterdam/Europe
 
 WORKDIR /defold
 
-# Get OS Architecture & Platform
-RUN os_arch=$(uname -m | awk '{print tolower($0)}') 
-RUN os_platform=$(uname -s | awk '{print tolower($0)}') 
+COPY ./setup.sh /defold/setup.sh
+RUN chmod +x /defold/setup.sh
+RUN /defold/setup.sh
 
-# Update APT registry
-RUN apt-get update -y
-
-# Install build tools
-RUN apt-get install -y jq curl unzip
-
-# Install Java Development Kit
-RUN apt-get install -y openjdk-17-jdk openjdk-17-jre
-RUN java --version 
-
-# Get latest stable Defold version and SHA1
-RUN stable_info=$(curl http://d.defold.com/stable/info.json -s)
-RUN version=$(echo $stable_info | jq -r '.version')
-RUN hash=$(echo $stable_info | jq -r '.sha1')
-
-# Download bob.jar
-RUN curl -L -o bob.jar https://github.com/defold/defold/releases/download/$version/bob.jar -s
\ No newline at end of file
diff --git a/java-defold-bob/setup.sh b/java-defold-bob/setup.sh
new file mode 100644
index 0000000..24e48cc
--- /dev/null
+++ b/java-defold-bob/setup.sh
@@ -0,0 +1,48 @@
+# Console Colors
+Color_Off='\033[0m'       # Text Reset
+Black='\033[0;30m'        # Black
+Red='\033[0;31m'          # Red
+Green='\033[0;32m'        # Green
+Yellow='\033[0;33m'       # Yellow
+Blue='\033[0;34m'         # Blue
+Purple='\033[0;35m'       # Purple
+Cyan='\033[0;36m'         # Cyan
+White='\033[0;37m'        # White
+
+# Get OS Architecture & Platform
+os_arch=$(uname -m | awk '{print tolower($0)}') 
+os_platform=$(uname -s | awk '{print tolower($0)}') 
+
+echo "$Green> OS Architecture: $os_arch $Color_Off"
+echo "$Green> OS Platform: $os_platform $Color_Off"
+
+# Update APT registry
+echo "$Green> Updating APT registry $Color_Off"
+apt-get update -y -qq
+echo "$Green> APT registry updated $Color_Off"
+
+# Install build tools
+echo "$Green> Installing build tools $Color_Off"
+apt-get install -y jq curl unzip wget
+echo "$Green> Build tools installed $Color_Off"
+
+# Install Java Development Kit
+echo "$Green> Installing Java Development Kit $Color_Off"
+apt-get install -y openjdk-17-jdk openjdk-17-jre
+java --version 
+echo "$Green> Java Development Kit installed $Color_Off"
+
+# Get latest stable Defold version and SHA1
+echo "$Green> Getting latest stable Defold version and SHA1 $Color_Off"
+stable_info=$(curl http://d.defold.com/stable/info.json -s)
+version=$(echo $stable_info | jq -r '.version')
+hash=$(echo $stable_info | jq -r '.sha1')
+
+echo "$Green> Latest stable Defold version: $version $Color_Off"
+echo "$Green> Latest stable Defold SHA1: $hash $Color_Off"
+
+# Download bob.jar
+echo "$Green> Fetching bob.jar $Color_Off"
+wget https://github.com/defold/defold/releases/download/$version/bob.jar -O bob.jar --progress=bar:force:noscroll --no-check-certificate --quiet
+java -jar bob.jar --version
+echo "$Green> bob.jar available $Color_Off"