From 3f40a51cdb25b23d6219249fa738d8accd07a212 Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Wed, 21 Nov 2018 22:59:46 +0100
Subject: [PATCH] move package files to unique name (#3438)

---
 .ci/travis-compile.sh | 11 ++++++++++-
 .travis.yml           |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.ci/travis-compile.sh b/.ci/travis-compile.sh
index 4aa1c1aa9..faaa5f604 100644
--- a/.ci/travis-compile.sh
+++ b/.ci/travis-compile.sh
@@ -17,7 +17,8 @@ while [[ "$@" ]]; do
       ;;
     '--package')
       MAKE_PACKAGE=1
-      shift
+      PACKAGE_NAME="$2"
+      shift 2
       ;;
     '--server')
       MAKE_SERVER=1
@@ -117,4 +118,12 @@ fi
 
 if [[ $MAKE_PACKAGE ]]; then
   make package
+  if [[ $PACKAGE_NAME ]]; then
+    if file=$(find . -maxdepth 1 -type f -name Cockatrice-*.* -print -quit); then
+      mv "$file" "${file%%.*}-$PACKAGE_NAME.${file#*.}"
+    else
+      echo "could not find package" >&2
+      exit 1
+    fi
+  fi
 fi
diff --git a/.travis.yml b/.travis.yml
index 54762df4e..21a7a55d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ matrix:
     script: docker run --mount "type=bind,source=$(pwd),target=/src" -w="/src" 
           --mount "type=bind,source=$HOME/.ccache,target=/.ccache" -e "CCACHE_DIR=/.ccache"
           img
-          bash .ci/travis-compile.sh --server --package --release
+          bash .ci/travis-compile.sh --server --package "Ubuntu18.04" --release
 
   #Ubuntu Xenial (Debug only)
   - name: Ubuntu Xenial (Debug)
@@ -63,7 +63,7 @@ matrix:
       - brew install ccache
       - brew install protobuf --without-python@2
       - brew install qt
-    script: bash ./.ci/travis-compile.sh --server --package --release
+    script: bash ./.ci/travis-compile.sh --server --package "" --release
 
 
 # Builds for pull requests skip the deployment step altogether