From cbcbc879c967314cc5e7f2fa9528c7fd950ca7ac Mon Sep 17 00:00:00 2001
From: Stephen Gaito <stephen@perceptisys.co.uk>
Date: Fri, 29 Nov 2019 09:57:32 +0000
Subject: [PATCH] refactored overall bulid process scripts

---
 buildScripts/createImages   | 14 +++++++++++
 buildScripts/doItAllLocally | 46 -------------------------------------
 buildScripts/uploadImages   |  2 ++
 3 files changed, 16 insertions(+), 46 deletions(-)
 create mode 100644 buildScripts/createImages
 delete mode 100755 buildScripts/doItAllLocally

diff --git a/buildScripts/createImages b/buildScripts/createImages
new file mode 100644
index 0000000..7b3a205
--- /dev/null
+++ b/buildScripts/createImages
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# This bash script creates the pdf2htmlEX AppImage and Docker Images
+
+#################
+# do the creation
+
+./buildScripts/reportEnvs        || { echo 'reportEnvs FAILED'        ; exit 1 ; }
+
+./buildScripts/createAppImage    || { echo 'createAppImage FAILED'    ; exit 1 ; }
+
+./buildScripts/createDockerImage || { echo 'createDockerImage FAILED' ; exit 1 ; }
+
+
diff --git a/buildScripts/doItAllLocally b/buildScripts/doItAllLocally
deleted file mode 100755
index d7c1351..0000000
--- a/buildScripts/doItAllLocally
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# This bash script builds the complete pdf2htmlEX application LOCALLY
-# (It creates local versions of the AppImage or Docker images)
-
-# Adjust the following two environment variables to suit your needs
-#
-export UNATTENDED="--assume-yes"
-export MAKE_PARALLEL="-j $(nproc)"
-
-# choose one of the following...
-#
-export PDF2HTMLEX_BRANCH=newBuildSystem
-# export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
-
-################
-# do the build
-
-./buildScripts/versionEnvs       || { echo 'versionEnvs FAILED'       ; exit 1 ; }
-
-./buildScripts/reportEnvs        || { echo 'reportEnvs FAILED'        ; exit 1 ; }
-
-./buildScripts/getBuildTools     || { echo 'getBuildTools FAILED'     ; exit 1 ; }
-
-./buildScripts/getDevLibraries   || { echo 'getDevLibraries FAILED'   ; exit 1 ; }
-
-./buildScripts/getPoppler        || { echo 'getPoppler FAILED'        ; exit 1 ; }
-
-./buildScripts/buildPoppler      || { echo 'buildPoppler FAILED'      ; exit 1 ; }
-
-./buildScripts/installPoppler    || { echo 'installPoppler FAILED'    ; exit 1 ; }
-
-./buildScripts/getFontforge      || { echo 'getFontforge FAILED'      ; exit 1 ; }
-
-./buildScripts/buildFontforge    || { echo 'buildFontforge FAILED'    ; exit 1 ; }
-
-./buildScripts/installFontforge  || { echo 'installFontforge FAILED'  ; exit 1 ; }
-
-./buildScripts/buildPdf2htmlEX   || { echo 'buildPdf2htmlEX FAILED'   ; exit 1 ; }
-
-./buildScripts/installPdf2htmlEX || { echo 'installPdf2htmlEX FAILED' ; exit 1 ; }
-
-./buildScripts/createAppImage    || { echo 'createAppImage FAILED'    ; exit 1 ; }
-
-./buildScripts/createDockerImage || { echo 'createDockerImage FAILED' ; exit 1 ; }
-
diff --git a/buildScripts/uploadImages b/buildScripts/uploadImages
index 8941229..63b3b30 100644
--- a/buildScripts/uploadImages
+++ b/buildScripts/uploadImages
@@ -6,6 +6,8 @@
 ################
 # do the uploads
 
+./buildScripts/reportEnvs          || { echo 'reportEnvs FAILED'        ; exit 1 ; }
+
 ./buildScripts/uploadGitHubRelease || { echo 'uploadGitHubRelease FAILED' ; exit 1 ; }
 
 ./buildScripts/uploadDockerImage   || { echo 'uploadDockerImage   FAILED' ; exit 1 ; }