From bf325d3859bb5f63092e18b122e38842b6ace6c7 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Sat, 25 Feb 2017 14:02:46 -0700 Subject: [PATCH] Change travis tar command to specify compression format macOS uses bsdtar which doesn't have the -a flag which determines compression based on file extension. --- .travis-upload.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis-upload.sh b/.travis-upload.sh index 262259678c..2cc968298f 100755 --- a/.travis-upload.sh +++ b/.travis-upload.sh @@ -6,6 +6,7 @@ if [ "$TRAVIS_EVENT_TYPE" = "push" ]&&[ "$TRAVIS_BRANCH" = "master" ]; then if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then REV_NAME="citra-linux-${GITDATE}-${GITREV}" ARCHIVE_NAME="${REV_NAME}.tar.xz" + COMPRESSION_FLAGS="-cJvf" mkdir "$REV_NAME" cp build/src/citra/citra "$REV_NAME" @@ -13,6 +14,7 @@ if [ "$TRAVIS_EVENT_TYPE" = "push" ]&&[ "$TRAVIS_BRANCH" = "master" ]; then elif [ "$TRAVIS_OS_NAME" = "osx" ]; then REV_NAME="citra-osx-${GITDATE}-${GITREV}" ARCHIVE_NAME="${REV_NAME}.tar.gz" + COMPRESSION_FLAGS="-czvf" mkdir "$REV_NAME" cp build/src/citra/Release/citra "$REV_NAME" @@ -120,7 +122,7 @@ EOL cp license.txt "$REV_NAME" cp README.md "$REV_NAME" - tar -cavf "$ARCHIVE_NAME" "$REV_NAME" + tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME" # move the compiled archive into the artifacts directory to be uploaded by travis releases mv "$ARCHIVE_NAME" artifacts/