diff --git a/src/travis/linux-install.sh b/src/travis/linux-install.sh index f68ae971..4badac3b 100755 --- a/src/travis/linux-install.sh +++ b/src/travis/linux-install.sh @@ -4,7 +4,7 @@ if [[ "$TRAVIS_JOB_NAME" == *"Testing" ]]; then export gampath=$(readlink -e .) else $python -OO -m PyInstaller --clean --noupx --strip -F gam.spec - export gampath=$(readlink -e gam) + export gampath=$(readlink -e dist) export gam="${gampath}/gam" export GAMVERSION=`$gam version simple` cp LICENSE $gampath diff --git a/src/travis/osx-before-install.sh b/src/travis/osx-before-install.sh index 6436ab9e..9f228a80 100755 --- a/src/travis/osx-before-install.sh +++ b/src/travis/osx-before-install.sh @@ -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..." - tar xf openssl-$BUILD_OPENSSL_VERSION.tar.gz + gtar 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..." - tar xf Python-$BUILD_PYTHON_VERSION.tar.xz + gtar 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 81d43434..2c39efe8 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 -tar cfJ $GAM_ARCHIVE --transform s/$gampath/gam $gampath +gtar cfJ $GAM_ARCHIVE --transform s/$gampath/gam $gampath diff --git a/src/travis/windows-install.sh b/src/travis/windows-install.sh index 348b0de9..5e3a39e6 100755 --- a/src/travis/windows-install.sh +++ b/src/travis/windows-install.sh @@ -1,7 +1,7 @@ cd src echo "compiling GAM with pyinstaller..." pyinstaller --clean --noupx -F gam.spec -export gampath=$(readlink -e gam) +export gampath=$(readlink -e dist) export gam="${gampath}/gam" echo "running compiled GAM..." $gam version