From 7155ed25cc5b5deaf54c394eeafe459aea5ee957 Mon Sep 17 00:00:00 2001
From: Stephen Gaito <stephen@perceptisys.co.uk>
Date: Mon, 25 Nov 2019 22:06:17 +0000
Subject: [PATCH] corrected travis 6

---
 .travis.yml                  | 56 +++++++++++++++++++-----------------
 buildScripts/getBuildTools   | 27 ++++++++---------
 buildScripts/getDevLibraries | 19 ++++++------
 3 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 83ea400..32e5583 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,33 +17,33 @@ env:
   global:
     - UNATTENDED="--assume-yes"
 
-addons:
-  apt:
-  update: true
-  packages:
-    # build tools
-    - git
-    - pkg-config
-    - ruby
-    - autoconf
-    - libtool
-    - cmake
-    - make
-    - gcc
-    - g++
-    - gettext
-    - openjdk-8-jre-headless
-    - tree
-    # dev libraries
-    - libcairo-dev
-    - libspiro-dev
-    - libpng-dev
-    - libjpeg-dev
-    - poppler-data
-    - libpango1.0-dev
-    - liblcms2-dev
-    - libxml2-dev
-    - libuninameslist-dev
+#addons:
+#  apt:
+#  update: true
+#  packages:
+#    # build tools
+#    - git
+#    - pkg-config
+#    - ruby
+#    - autoconf
+#    - libtool
+#    - cmake
+#    - make
+#    - gcc
+#    - g++
+#    - gettext
+#    - openjdk-8-jre-headless
+#    - tree
+#    # dev libraries
+#    - libcairo-dev
+#    - libspiro-dev
+#    - libpng-dev
+#    - libjpeg-dev
+#    - poppler-data
+#    - libpango1.0-dev
+#    - liblcms2-dev
+#    - libxml2-dev
+#    - libuninameslist-dev
 #  homebrew:
 #    packages:
 #      - autoconf
@@ -76,6 +76,8 @@ matrix:
 
 script:
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+  - ./buildScripts/getBuildTools     || travis_terminate 1;
+  - ./buildScripts/getDevLibraries   || travis_terminate 1;
   - ./buildScripts/getPoppler        || travis_terminate 1;
   - ./buildScripts/buildPoppler      || travis_terminate 1;
   - ./buildScripts/installPoppler    || travis_terminate 1;
diff --git a/buildScripts/getBuildTools b/buildScripts/getBuildTools
index 9219bb8..d4f29c6 100755
--- a/buildScripts/getBuildTools
+++ b/buildScripts/getBuildTools
@@ -5,18 +5,19 @@
 # set the bash environment variable 'UNATTENDED' to '--assume-yes' for 
 # unattended use (for example in the .travis.yml script)
 
-sudo apt $UNATTENDED install	\
-  aptitude			\
-  git				\
-  pkg-config			\
-  ruby				\
-  autoconf			\
-  libtool			\
-  cmake				\
-  make				\
-  gcc				\
-  g++				\
-  gettext			\
-  openjdk-8-jre-headless	\
+sudo apt-get update
+sudo apt-get $UNATTENDED install	\
+  aptitude				\
+  git					\
+  pkg-config				\
+  ruby					\
+  autoconf				\
+  libtool				\
+  cmake					\
+  make					\
+  gcc					\
+  g++					\
+  gettext				\
+  openjdk-8-jre-headless		\
   tree
 
diff --git a/buildScripts/getDevLibraries b/buildScripts/getDevLibraries
index eab6818..05638c3 100755
--- a/buildScripts/getDevLibraries
+++ b/buildScripts/getDevLibraries
@@ -6,14 +6,15 @@
 # set the bash environment variable 'UNATTENDED' to '--assume-yes' for
 # unattended use (for example in the .travis.yml script)
 
-sudo apt $UNATTENDED install	\
-  libcairo-dev			\
-  libspiro-dev			\
-  libpng-dev			\
-  libjpeg-dev			\
-  poppler-data			\
-  libpango1.0-dev		\
-  liblcms2-dev			\
-  libxml2-dev			\
+sudo apt-get update
+sudo apt-get $UNATTENDED install	\
+  libcairo-dev				\
+  libspiro-dev				\
+  libpng-dev				\
+  libjpeg-dev				\
+  poppler-data				\
+  libpango1.0-dev			\
+  liblcms2-dev				\
+  libxml2-dev				\
   libuninameslist-dev