deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-04 21:01:36 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

few build / install cleanups

Browse Source
This commit is contained in:
Jay Lee
2021-05-25 12:59:57 -04:00
parent 34b51ea64a
commit 4e719bab5e
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/actions/macos-install.sh vendored
View File

@@ -18,8 +18,7 @@ $gam version extended
export GAMVERSION=`$gam version simple` export GAMVERSION=`$gam version simple`
cp LICENSE "${gampath}" cp LICENSE "${gampath}"
cp GamCommands.txt "${gampath}" cp GamCommands.txt "${gampath}"
MACOSVERSION=$(defaults read loginwindow SystemVersionStampAsString) GAM_ARCHIVE="gam-${GAMVERSION}-${GAMOS}-${PLATFORM}.tar.xz"
GAM_ARCHIVE="gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-MacOS${MACOSVERSION}.tar.xz"
rm "${gampath}/lastupdatecheck.txt" rm "${gampath}/lastupdatecheck.txt"
# tar will cd to dist/ and tar up gam/ # tar will cd to dist/ and tar up gam/
tar -C dist/ --create --file $GAM_ARCHIVE --xz gam tar -C dist/ --create --file $GAM_ARCHIVE --xz gam

1
.github/workflows/build.yml vendored
View File

@@ -141,6 +141,7 @@ jobs:
echo "RUNNING: apt update..." echo "RUNNING: apt update..."
sudo apt-get -qq --yes update > /dev/null sudo apt-get -qq --yes update > /dev/null
sudo apt-get -qq --yes install swig libpcsclite-dev sudo apt-get -qq --yes install swig libpcsclite-dev
$pip install --upgrade pip
- name: Build and install Python, OpenSSL and PyInstaller - name: Build and install Python, OpenSSL and PyInstaller
if: matrix.goal != 'test' && steps.cache-primes.outputs.cache-hit != 'true' if: matrix.goal != 'test' && steps.cache-primes.outputs.cache-hit != 'true'

14
src/gam-install.sh
View File

@@ -29,7 +29,7 @@ gamversion="latest"
adminuser="" adminuser=""
regularuser="" regularuser=""
gam_glibc_vers="2.31 2.27 2.23" 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 while getopts "hd:a:o:b:lp:u:r:v:" OPTION
do do
@@ -128,18 +128,6 @@ case $gamos in
this_macos_ver=$osversion this_macos_ver=$osversion
fi fi
echo "You are running MacOS $this_macos_ver" 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" gamfile="macos-x86_64.tar.xz"
;; ;;
MINGW64_NT*) MINGW64_NT*)