Travis: fix checkinstall issue with version numbers

.travis.yml

@@ -1,9 +1,10 @@
 language: cpp
-
 env:
   global:
-  - secure: h7qbZQY6qjlbC/eiuWdBbKBtgHjhu/orIoi+3z0my4NXYQLOpdqT0C6whuWdOzr+nbWzo3iny5wkG+GcLDXyTspv/NP+0fQVirvUTV5sZjxPb0ykmWHoE88+SraypUk/3QLAfql8MO+nfGUTWcM8Ium/hUsF2cDJuhgpWP0pjvAe0Kbufg9eIA5RIwjNyHvloYVmFVpm9BqFpq1SonRpFx01WljmNZN2apjyTEpTd5wCagkAfz3aE16bmWorVUvfpBErHNHHvcqC3GdSRldtXBzBX4ImLpZfhHB1pW/VRr0SN1t0eO+dBRir3lvpXWPWaaDNASSjtEgfzR2/b/4onC1CeKE0nTVLD7/4HsZnbuvTCFoAn1y+02WeaJQ8LiXbf7wBAC/lfARPLTY3VDmqmq76e3W93qjhjm8sxj6xncMAzMlvB1H9PKOovYO3HTARLdztlX2mbJCNhfd8mt8sSqkV7Cwj6Pdghpi/QI1TNl4BdJ0U0hLGnJaOLnQd8AnU+34gLv89iQslpBNDOiTJmkXiTb1NkuL3H8qDVseeMZN2mxlZRq7Ree5LJOMf/RLSO7zMN5lZaI6gafmrAYwSExQMqCIfyF7k1MrtmzN42nE4JlLbxEj7mozwqpxqMx2XsETbxhRz1XrQ2/F5YPRVZ5D7o/e/wnIPUfp07yisitU=
-  - secure: k5I2bbr+u1dKk3B+GPyyp2tp6n2ZNngCEKVZxwXAifRbdqhilmpwNJKH3JQxHGs+MvDfAd8VXc+VSjzBfWYrbrvs2EeZS10X2yDQuNU9Fhua0OCD6aSdZ4O4keUx8tEqT4RnzDghc7HRhuJtA5reFXgu/d3IAWZB2wKI3Bg3iT7l4Nll15+1ZwqbdTB49VBZe5rKzh3c603m/aiAQOmBoYx7I1iDKCY3CPPAuUG0WMYMZBnGOo9/6rJbWl0q1XwlEUvv8r818Ft/uP2RH7cZSit6eRKaVFFKfLmnt7cZvwpuvc+RU5ZCnBooz+JjCLA+kWe0euaMe6HxiDMr9b2BFynS3a7wr2qy1jREJ//SwDviBJjPFhN0XCLkpj/CrrFcW1JpAwGjlGSlYBLjFjuepNvBSNFSNIqen+4cTtqtTf5lB9Z/d8oxtorAXzGSjNK9vhXXfodSxFICECyWG4RGlAjqV9/vdTd4eRvIIN7JgrcoU5lZ5Nn21DC+0brPZEy6NZfbVCP00Z1NKy0nWMiAt0WA2Q3lmCcwb+fEO/hJClmrdkKdPTir/TdV+MCZKbEervCU0kXtn8fDv2tB0VKeJM3hZwpxv1G+NuYng3gDFfO7Uka6oh5ESaw/9Ebrol09lUpxaRW588FVopRQbow/QVLzAwcXRPuwI9gnvJbg6d0=
+  # AWS key ID
+  - secure: pAiNUGVbjP12BfnWPk0FFTkbnk4Tocvv88XiT3rzRqkQaD7/iyEogLBfHM4nOEgFiIMHbC41aE83w5JgRNPwn6mTgoQBOglzqq1tGuXfqPyV2VStk8beji1evubGoVjjPaoPTFyIdQc5GGxdHyogI/ed9Hb3ccyykYvjyolj9XoCiW42QHx60AHGwl+So+dEa8xydj9SLRPlZ/AitmI/cPVN3YotA7s37BLFiab54enxk7T4rwpR1nU0HVfoCpn5F4wZYxRq+LlSVFzC8vVE9cpDSLS5kjrZIZaT18tYG1/untCj+wqMIZbghaJXLtPSRW2YPHcJTz8q1YSXnJ19+0uiAIMAqaVv0kD5BAM97byYDBW+b9H6SYFkb/Pw/qcK9amMzMBjDPFpYFkl9Q2kzhsNs3HsZf/flSZjtrkQJiP3SOi/KvKzVK9X4Wym6hYZWHgmMTTYFrvr6BYnf2GkpfKNjm1d2kc0NNrq4d5H4NOEQB8MP+QH+o+BPeM6d9dthrUc1Pw+BXzOAr85CN4qtpPGoAl/Dbfgd6eu/88E2LpUufW2VFAOPWjykSOqzSN3orh7AaWuE34VFEnQ+2y3uIE8AKoyXzJv6zYkyNnNewKZeGe2kKYNwLn5UxQA9JEj7a+tvVevk4xBSkkjFAvjSG2z8/F1FXNbEfoLX1Hz/bU=
+  # AWS key secret
+  - secure: bGwljoP3E1OVBXLXox0O6p8kwQXLcNQ8YDKVa4H8u9Y+Ic7uqE4iV3rYS3ynNWSBMVRWY3ZbyClnhrCNwRhBAlcd8qWSJdpjVzs6HdQyzhuKa1P3V4FJPb7upGP/5R/DECGwex8Mun9dmXpYDak75LxfKIJUidPis5VDCYqul7k/xVVCou6Ctjpj7vQhWXDj2G/py+mdB8DERhymnQCtyK1Ziu8c4QlFKByZmnD72GFm/h3JPI1Pq1V2mz3x6x6GaYjb9Rdbd0UNwqjGQX4q2M/c3GEJa6B2JBCoTncawNZBNnPUF9qtv+zh0TNaNHMRWX13AJ/qYB+nVDub0C9b/6Mc48mt0Tv4ze15MproVrylZdV6qHYEG8yGPBqpTVbRP6gv6Y2TXIHWoTzqA+F/Gv2IDChyHXsld/MQQS2MSo5iaYktIrZKtX8Z0qAmTzPwIVBromaSI3vrE7UH0fRSQ6fAM8+Tn+MRthOBdqu23kS1dnG+X2CPbUhBfsJp0OSwVQD5jQtA51/sREVeGFiJvzQIkvwQDjb5MYilsRnwmoBXemkLmqaviXVY4rz1o5AIvz2pgZS2YggK1xHZCuI5tSjcNEkb77VwZTfsqrdDo9EJh6VgfdnGlHQhR2/A5hUJ4ANpJ/LgZlgfVp71Xg2GWQW6M4Znc5uj6A6xLBkO6FA=
 
 matrix:
   include:
@@ -13,14 +14,15 @@ matrix:
     services:
     - docker
     before_install:
-    - docker run -d --name xenial -v $(dirname $(pwd)):/root -v /home/travis/package:/package -e TRAVIS_BRANCH="$TRAVIS_BRANCH"
-      -w /root nimmis/ubuntu:16.04
+    - docker run -d --name xenial -v $(dirname $(pwd)):/root -v /home/travis/package:/package
+      -e TRAVIS_BRANCH="$TRAVIS_BRANCH" -w /root nimmis/ubuntu:16.04
     - docker exec -it xenial /root/obs-websocket/CI/install-dependencies-xenial.sh
     script:
     - docker exec -it xenial /root/obs-websocket/CI/build-xenial.sh
     after_success:
     - docker exec -it xenial /root/obs-websocket/CI/package-xenial.sh
     - ls -lh /home/travis/package
+
   - os: osx
     osx_image: xcode8.3
     before_install: "./CI/install-dependencies-osx.sh"
@@ -38,4 +40,4 @@ deploy:
   acl: public_read
   on:
     repo: Palakis/obs-websocket
-    condition: "$TRAVIS_OS_NAME = linux"
+    condition: "$TRAVIS_OS_NAME = linux"

CI/package-xenial.sh

@@ -5,7 +5,7 @@ set -e
 cd /root/obs-websocket
 
 export GIT_HASH=$(git rev-parse --short HEAD)
-export PKG_VERSION="$GIT_HASH-$TRAVIS_BRANCH-git"
+export PKG_VERSION="1-$GIT_HASH-$TRAVIS_BRANCH-git"
 
 if [ -n "${TRAVIS_TAG}" ]; then
 	export PKG_VERSION="$TRAVIS_TAG"
@@ -13,8 +13,6 @@ fi
 
 cd /root/obs-websocket/build
 
-rm -f /package/*
-
 PAGER=cat checkinstall -y --type=debian --fstrans=no --nodoc \
 	--backup=no --deldoc=yes --install=no \
 	--pkgname=obs-websocket --pkgversion="$PKG_VERSION" \