From a04f231c9ed46bce45548dc229c09534e7c3269e Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Thu, 23 Apr 2020 16:40:07 -0400
Subject: [PATCH] macos and win travis fixes

---
 src/travis/osx-before-install.sh | 6 +++---
 src/travis/osx-install.sh        | 2 +-
 src/travis/windows-install.sh    | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/travis/osx-before-install.sh b/src/travis/osx-before-install.sh
index 9f228a80..d4d664e8 100755
--- a/src/travis/osx-before-install.sh
+++ b/src/travis/osx-before-install.sh
@@ -9,7 +9,7 @@ echo "This device has $cpucount CPUs for compiling..."
 #brew upgrade
 
 # prefer standard GNU tools like date over MacOS defaults
-export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
+export PATH="/usr/local/opt/coreutils/libexec/gnubin:$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$PATH"
 
 cd ~
 
@@ -61,7 +61,7 @@ if [ $SSLRESULT -ne 0 ] || [[ "$SSLVER" != "OpenSSL $BUILD_OPENSSL_VERSION "* ]]
   # Compile latest OpenSSL
   wget --quiet https://www.openssl.org/source/openssl-$BUILD_OPENSSL_VERSION.tar.gz
   echo "Extracting OpenSSL..."
-  gtar xf openssl-$BUILD_OPENSSL_VERSION.tar.gz
+  tar xf openssl-$BUILD_OPENSSL_VERSION.tar.gz
   cd openssl-$BUILD_OPENSSL_VERSION
   echo "Compiling OpenSSL $BUILD_OPENSSL_VERSION..."
   ./config shared --prefix=$HOME/ssl
@@ -75,7 +75,7 @@ if [ $SSLRESULT -ne 0 ] || [[ "$SSLVER" != "OpenSSL $BUILD_OPENSSL_VERSION "* ]]
   echo "Downloading Python $BUILD_PYTHON_VERSION..."
   curl -O https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/Python-$BUILD_PYTHON_VERSION.tar.xz
   echo "Extracting Python..."
-  gtar xf Python-$BUILD_PYTHON_VERSION.tar.xz
+  tar xf Python-$BUILD_PYTHON_VERSION.tar.xz
   cd Python-$BUILD_PYTHON_VERSION
   echo "Compiling Python $BUILD_PYTHON_VERSION..."
   safe_flags="--with-openssl=$HOME/ssl --enable-shared --prefix=$HOME/python --with-ensurepip=upgrade"
diff --git a/src/travis/osx-install.sh b/src/travis/osx-install.sh
index f5387a1b..9a0dc770 100755
--- a/src/travis/osx-install.sh
+++ b/src/travis/osx-install.sh
@@ -12,4 +12,4 @@ cp GamCommands.txt $gampath
 MACOSVERSION=$(defaults read loginwindow SystemVersionStampAsString)
 GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-MacOS$MACOSVERSION.tar.xz
 rm $gampath/lastupdatecheck.txt
-gtar cfJ $GAM_ARCHIVE $gampath --transform s/.*dist/gam/
+tar cfJ $GAM_ARCHIVE $gampath --transform s/.*dist/gam/
diff --git a/src/travis/windows-install.sh b/src/travis/windows-install.sh
index 9cb180d7..263da9a0 100755
--- a/src/travis/windows-install.sh
+++ b/src/travis/windows-install.sh
@@ -14,6 +14,11 @@ cp gam-setup.bat $gampath
 GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.zip
 /c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE $gampath -xr!.svn
 /c/Program\ Files/7-Zip/7z.exe rn $GAM_ARCHIVE dist\ gam\
+
+echo "Running WIX candle $WIX_BITS..."
 /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/candle.exe -arch $WIX_BITS gam.wxs
+echo "Done with WIX candle..."
+echo "Running WIX light..."
 /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/light.exe -ext /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/WixUIExtension.dll gam.wixobj -o gam-$GAMVERSION-$GAMOS-$PLATFORM.msi || true;
+echo "Done with WIX light..."
 rm *.wixpdb