From 5cc91fef53cf2c0a311ca2521fade60f722c212b Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Sat, 5 Dec 2020 11:27:05 -0500 Subject: [PATCH] actions take 127 --- src/travis/windows-before-install.sh | 2 -- src/travis/windows-install.sh | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/travis/windows-before-install.sh b/src/travis/windows-before-install.sh index 58f055a7..1933f8df 100755 --- a/src/travis/windows-before-install.sh +++ b/src/travis/windows-before-install.sh @@ -2,12 +2,10 @@ if [[ "$PLATFORM" == "x86_64" ]]; then export BITS="64" export PYTHONFILE_BITS="-amd64" export OPENSSL_BITS="-x64" - export WIX_BITS="x64" elif [[ "$PLATFORM" == "x86" ]]; then export BITS="32" export PYTHONFILE_BITS="" export OPENSSL_BITS="" - export WIX_BITS="x86" export CHOCOPTIONS="--forcex86" fi echo "This is a ${BITS}-bit build for ${PLATFORM}" diff --git a/src/travis/windows-install.sh b/src/travis/windows-install.sh index effeb54c..190d51ee 100755 --- a/src/travis/windows-install.sh +++ b/src/travis/windows-install.sh @@ -1,3 +1,8 @@ +if [[ "$PLATFORM" == "x86_64" ]]; then + export WIX_BITS="x64" +elif [[ "$PLATFORM" == "x86" ]]; then + export WIX_BITS="x86" +fi echo "compiling GAM with pyinstaller..." export gampath="dist/gam" rm -rf $gampath @@ -7,7 +12,7 @@ pyinstaller --clean --noupx -F --distpath $gampath gam.spec export gam="${gampath}/gam" echo "running compiled GAM..." $gam version -export GAMVERSION=`$gam version simple` +export GAMVERSION=$($gam version simple) rm $gampath/lastupdatecheck.txt cp LICENSE $gampath cp GamCommands.txt $gampath