From e2ef8a293d98f45e2175893c9c9bc9914e5ac1bc Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Wed, 16 Oct 2019 16:23:41 -0400
Subject: [PATCH] more travis

---
 src/travis/linux-x86_64-before-install.sh   | 12 ++++++------
 src/travis/windows-x86_64-before-install.sh | 15 +--------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh
index fb9dbc3d..c21c8ab0 100755
--- a/src/travis/linux-x86_64-before-install.sh
+++ b/src/travis/linux-x86_64-before-install.sh
@@ -13,10 +13,12 @@ else
   PYVER=$(~/python/bin/python3 -V)
   PYRESULT=$?
   if [[ "$SSLRESULT" != "0" ]] || [[ "$SSLVER" != "OpenSSL $BUILD_OPENSSL_VERSION "* ]] || [[ "$PYRESULT" != "0" ]] || [[ "$PYVER" != "Python $PYTHON_BUILD_VERSION "* ]]; then
-    rm -rf ~/ssl
-    rm -rf ~/python
-    mkdir ~/ssl
-    mkdir ~/python
+    echo "SSL Result: $SSLRESULT - SSL Ver: $SSLVER - Py Result: $PYRESULT - Py Ver: $PYVER"
+    cd ~
+    rm -rf ssl
+    rm -rf python
+    mkdir ssl
+    mkdir python
     echo "RUNNING: apt update..."
     sudo apt-get -qq --yes update > /dev/null
     echo "RUNNING: apt dist-upgrade..."
@@ -30,8 +32,6 @@ else
     sudo cp -v /tmp/sources.list /etc/apt
     sudo apt-get -qq --yes update > /dev/null
     sudo apt-get -qq --yes build-dep python3 > /dev/null
-    cd ~
-    echo "EVERYTHING IN HOME..."
     cpucount=$(nproc --all)
     echo "This device has $cpucount CPUs for compiling..."
 
diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh
index 36ba875c..a1d2714b 100755
--- a/src/travis/windows-x86_64-before-install.sh
+++ b/src/travis/windows-x86_64-before-install.sh
@@ -9,17 +9,7 @@ cd ~
 #fi
 #echo "Installing $exefile..."
 #powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"
-#cinst -y python3
-PYVER=$(~/python/python.exe -V)
-PYRESULT=$?
-if [[ "$PYRESULT" != "0" ]] || [[ "$PYVER" != *"$BUILD_PYTHON_VERSION"* ]]; then
-  rm -rf python
-  mkdir python
-  echo "Downloading Python $BUILD_PYTHON_VERSION..."
-  wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/python-$BUILD_PYTHON_VERSION-embed-amd64.zip
-  7z e python-$BUILD_PYTHON_VERSION-embed-amd64.zip -opython
-  rm -rf python/*._pth # screws up pip library location
-fi
+cinst -y python3
 until cinst -y wixtoolset; do echo "trying again..."; done
 #until cp -v /c/ssl/libcrypto-1_1-x64.dll /c/Python37/DLLs/libcrypto-1_1.dll; do echo "trying again..."; done
 #until cp -v /c/ssl/libssl-1_1-x64.dll /c/Python37/DLLs/libssl-1_1.dll; do echo "trying again..."; done
@@ -28,9 +18,6 @@ cd $mypath
 export python=/c/Users/travis/python/python.exe
 export pip=/c/Users/travis/python/scripts/pip.exe
 
-curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-$python get-pip.py
-
 $pip install --upgrade pip
 $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $pip install -U
 $pip install --upgrade -r src/requirements.txt