From 4e719bab5ef4c00e9bd865c32041a8f5f7193770 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 25 May 2021 12:59:57 -0400
Subject: [PATCH] few build / install cleanups

---
 .github/actions/macos-install.sh |  3 +--
 .github/workflows/build.yml      |  1 +
 src/gam-install.sh               | 14 +-------------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.github/actions/macos-install.sh b/.github/actions/macos-install.sh
index 77194ba5..3e7e7d32 100755
--- a/.github/actions/macos-install.sh
+++ b/.github/actions/macos-install.sh
@@ -18,8 +18,7 @@ $gam version extended
 export GAMVERSION=`$gam version simple`
 cp LICENSE "${gampath}"
 cp GamCommands.txt "${gampath}"
-MACOSVERSION=$(defaults read loginwindow SystemVersionStampAsString)
-GAM_ARCHIVE="gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-MacOS${MACOSVERSION}.tar.xz"
+GAM_ARCHIVE="gam-${GAMVERSION}-${GAMOS}-${PLATFORM}.tar.xz"
 rm "${gampath}/lastupdatecheck.txt"
 # tar will cd to dist/ and tar up gam/
 tar -C dist/ --create --file $GAM_ARCHIVE --xz gam
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5ac61272..d9b2e8a0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -141,6 +141,7 @@ jobs:
              echo "RUNNING: apt update..."
              sudo apt-get -qq --yes update > /dev/null
              sudo apt-get -qq --yes install swig libpcsclite-dev
+             $pip install --upgrade pip
 
       - name: Build and install Python, OpenSSL and PyInstaller
         if: matrix.goal != 'test' && steps.cache-primes.outputs.cache-hit != 'true'
diff --git a/src/gam-install.sh b/src/gam-install.sh
index 1d666c7f..d9dff00f 100755
--- a/src/gam-install.sh
+++ b/src/gam-install.sh
@@ -29,7 +29,7 @@ gamversion="latest"
 adminuser=""
 regularuser=""
 gam_glibc_vers="2.31 2.27 2.23"
-gam_macos_vers="10.15.6 10.14.6 10.13.6"
+#gam_macos_vers="10.15.6 10.14.6 10.13.6"
 
 while getopts "hd:a:o:b:lp:u:r:v:" OPTION
 do
@@ -128,18 +128,6 @@ case $gamos in
       this_macos_ver=$osversion
     fi
     echo "You are running MacOS $this_macos_ver"
-    use_macos_ver=""
-    for gam_macos_ver in $gam_macos_vers; do
-      if version_gt $this_macos_ver $gam_macos_ver; then
-        use_macos_ver="MacOS$gam_macos_ver"
-        echo_green "Using GAM compiled on $use_macos_ver"
-        break
-      fi
-    done
-    if [ "$use_macos_ver" == "" ]; then
-      echo_red "Sorry, you need to be running at least MacOS $gam_macos_ver to run GAM"
-      exit
-    fi
     gamfile="macos-x86_64.tar.xz"
     ;;
   MINGW64_NT*)